Merge "Fix one NPE in tethering setting"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7025a9c..b489a89 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -795,6 +795,7 @@
android:value="com.android.settings.NotificationStation" />
</activity>
+ <!--
<activity android:name="Settings$AppOpsSummaryActivity"
android:label="@string/app_ops_settings"
android:taskAffinity=""
@@ -803,17 +804,15 @@
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APP_OPS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
- <!-- Not yet ready to expose.
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
- -->
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.AppOpsSummary" />
- <!--
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
- android:resource="@id/application_settings" /> -->
+ android:resource="@id/application_settings" />
</activity>
+ -->
<activity android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title"
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 6cdbdaf..39eefe2 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -525,7 +525,7 @@
& PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) {
if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + " perm "
+ appInfo.requestedPermissions[j] + " not granted; skipping");
- break;
+ continue;
}
}
if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + ": requested perm "
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index cb35e10..24f56c1 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -646,6 +646,8 @@
ap = new AccessPoint(getActivity(), mAccessPointSavedState);
// For repeated orientation changes
mDlgAccessPoint = ap;
+ // Reset the saved access point data
+ mAccessPointSavedState = null;
}
}
// If it's still null, fine, it's for Add Network