PowerProfile: allow reading from a file instead of resource

Unified builds may require reading different power profile for each variants. Allow reading power profile from a file instead of resource by querying ro.power_profile prop. Device maintainers can opt-in by using the init extension. Change-Id: I346bb3e5a71edfe7570af495b73ffd854042367f Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com>
ResurrectionRemix · Jun 20, 2017 · bf079b8 · bf079b8
1 parent 73645e5
commit bf079b8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/core/java/com/android/internal/os/PowerProfile.java b/core/java/com/android/internal/os/PowerProfile.java
@@ -20,12 +20,18 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
+import android.os.SystemProperties;
+import android.util.Xml;
 
 import com.android.internal.util.XmlUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
+import libcore.io.IoUtils;
+
+import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -210,14 +216,27 @@ public PowerProfile(Context context) {
     }
 
     private void readPowerValuesFromXml(Context context) {
-        int id = com.android.internal.R.xml.power_profile;
+        final String profilePath = SystemProperties.get("ro.power_profile",
+                                           "/system/etc/power_profile.xml");
         final Resources resources = context.getResources();
-        XmlResourceParser parser = resources.getXml(id);
+        XmlResourceParser resParser = null;
+        XmlPullParser parser = null;
         boolean parsingArray = false;
         ArrayList<Double> array = new ArrayList<Double>();
         String arrayName = null;
+        FileReader profileReader = null;
 
         try {
+            if (new File(profilePath).exists()) {
+                profileReader = new FileReader(profilePath);
+                parser = Xml.newPullParser();
+                parser.setInput(profileReader);
+            } else {
+                int id = com.android.internal.R.xml.power_profile;
+                resParser = resources.getXml(id);
+                parser = resParser;
+            }
+
             XmlUtils.beginDocument(parser, TAG_DEVICE);
 
             while (true) {
@@ -261,7 +280,10 @@ private void readPowerValuesFromXml(Context context) {
         } catch (IOException e) {
             throw new RuntimeException(e);
         } finally {
-            parser.close();
+            if (resParser != null) {
+                resParser.close();
+            }
+            IoUtils.closeQuietly(profileReader);
         }
 
         // Now collect other config variables.

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -799,6 +799,7 @@ protected void observe() {
         protected void unobserve() {
             super.unobserve();
             ContentResolver resolver = mContext.getContentResolver();
+            resolver.unregisterContentObserver(this);
         }
 
 	@Override