commit 989f4cb6da0c1d20f74a278878bc173c690d0848
author Jerome Gaillard <jgaillard@google.com> Thu Nov 24 21:51:22 2016 +0000
committer Jerome Gaillard <jgaillard@google.com> Mon Nov 28 10:40:33 2016 +0000
tree ca1ad345e537ca6ba7fe86254e35b460edd34c0f
parent 705dfac58d3a477d6d1877d04ba154c9e71b1d40

Fix layoutlib to reflect recent changes in platform code

Test: Layoutlib tests
Change-Id: I81964233a9e580ccee9c9e9b0cf3525babf30bd4

bridge/src/android/os/ServiceManager.java

diff --git a/bridge/src/android/os/ServiceManager.java b/bridge/src/android/os/ServiceManager.java
index 3e1ec07..c96d2ca 100644
--- a/bridge/src/android/os/ServiceManager.java
+++ b/bridge/src/android/os/ServiceManager.java
@@ -31,6 +31,13 @@
     }
 
     /**
+     * Is not supposed to return null, but that is fine for layoutlib.
+     */
+    public static IBinder getServiceOrThrow(String name) throws ServiceNotFoundException {
+        return null;
+    }
+
+    /**
      * Place a new @a service called @a name into the service
      * manager.
      *

bridge/src/android/os/SystemProperties_Delegate.java

diff --git a/bridge/src/android/os/SystemProperties_Delegate.java b/bridge/src/android/os/SystemProperties_Delegate.java
index af0c456..d299add 100644
--- a/bridge/src/android/os/SystemProperties_Delegate.java
+++ b/bridge/src/android/os/SystemProperties_Delegate.java
@@ -102,4 +102,9 @@
     /*package*/ static void native_add_change_callback() {
         // pass.
     }
+
+    @LayoutlibDelegate
+    /*package*/ static void native_report_sysprop_change() {
+        // pass.
+    }
 }