diff options
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 3 | ||||
| -rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 955475e401ff..44cf9a41c40c 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -1222,6 +1222,9 @@ public class RelativeLayout extends ViewGroup { throw new IllegalStateException("A view cannot have a dependency" + " on itself"); } + if (dependency == null) { + continue; + } // Add the current node as a dependent dependency.dependents.add(node); // Add a dependency to the current node diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index efa617943e17..a6639de4aa78 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -164,8 +164,7 @@ class BackupManagerService extends IBackupManager.Stub { // Set up our transport options and initialize the default transport // TODO: Have transports register themselves somehow? // TODO: Don't create transports that we don't need to? - mTransportId = BackupManager.TRANSPORT_LOCAL; - //mTransportId = BackupManager.TRANSPORT_GOOGLE; + mTransportId = BackupManager.TRANSPORT_GOOGLE; mLocalTransport = new LocalTransport(context); // This is actually pretty cheap mGoogleTransport = null; |