diff options
| author | Camera Software Integration <camswint@localhost> | 2017-02-28 04:42:26 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-28 04:42:26 -0800 |
| commit | d27f3e0dc7420033d5a4b360b271516493862cb4 (patch) | |
| tree | cdbf1128708115e70afe36a14aa3c8f55a09dc53 | |
| parent | dea6b33f750a9675903dc4ff45779c7891d164ec (diff) | |
| parent | 31ff242766e93020630acb51b0e3104d5c02d977 (diff) | |
| download | android_packages_apps_Snap-d27f3e0dc7420033d5a4b360b271516493862cb4.tar.gz android_packages_apps_Snap-d27f3e0dc7420033d5a4b360b271516493862cb4.tar.bz2 android_packages_apps_Snap-d27f3e0dc7420033d5a4b360b271516493862cb4.zip | |
Merge "SnapdragonCamera: Fix memory leak" into camera.lnx.1.0-dev.1.0
| -rwxr-xr-x | AndroidManifest.xml | 1 | ||||
| -rwxr-xr-x | src/com/android/camera/CameraActivity.java | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/PermissionsActivity.java | 7 |
3 files changed, 3 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e44f9cc94..06ad579ae 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -67,6 +67,7 @@ <activity android:name="com.android.camera.PermissionsActivity" android:label="@string/app_name" + android:launchMode="singleTop" android:configChanges="orientation|screenSize|keyboardHidden" android:parentActivityName="com.android.camera.CameraActivity" > <meta-data diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 32d499a38..046265131 100755 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1774,6 +1774,7 @@ public class CameraActivity extends Activity if(!mSecureCamera && (!isRequestShown || !hasCriticalPermissions())) { Log.v(TAG, "Start Request Permission"); Intent intent = new Intent(this, PermissionsActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); SharedPreferences.Editor editor = prefs.edit(); editor.putBoolean(CameraSettings.KEY_REQUEST_PERMISSION, true); diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java index e8df5c571..91699c34f 100644..100755 --- a/src/com/android/camera/PermissionsActivity.java +++ b/src/com/android/camera/PermissionsActivity.java @@ -44,11 +44,6 @@ public class PermissionsActivity extends Activity { super.onCreate(savedInstanceState); mIntent = getIntent(); mIsReturnResult = false; - } - - @Override - protected void onResume() { - super.onResume(); if (!mCriticalPermissionDenied && !mIsReturnResult) { mNumPermissionsToRequest = 0; checkPermissions(); @@ -56,7 +51,7 @@ public class PermissionsActivity extends Activity { mCriticalPermissionDenied = false; } } - + private void checkPermissions() { if (checkSelfPermission(Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { |