diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-10-09 14:07:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 14:07:16 -0700 |
commit | 6a4991f5ed16f507e8a3f5fac04616a438edbff1 (patch) | |
tree | a415e20edc6a56c8af1ee4d8010ea352cfe000da /packages/DocumentsUI | |
parent | e8350122294d2e6630f635702bbc518fab2ac1fa (diff) | |
parent | 467b30bb2bb1a2333835dd39b78fcd4b2f240ae6 (diff) | |
download | frameworks_base-6a4991f5ed16f507e8a3f5fac04616a438edbff1.zip frameworks_base-6a4991f5ed16f507e8a3f5fac04616a438edbff1.tar.gz frameworks_base-6a4991f5ed16f507e8a3f5fac04616a438edbff1.tar.bz2 |
am 467b30bb: am d0da14a9: am aa841672: Merge "Support overriding calling package in Documents." into klp-dev
* commit '467b30bb2bb1a2333835dd39b78fcd4b2f240ae6':
Support overriding calling package in Documents.
Diffstat (limited to 'packages/DocumentsUI')
-rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index 7660779..d675e8d 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -292,7 +292,7 @@ public class DocumentsActivity extends Activity { @Override protected Void doInBackground(Void... params) { // Restore last stack for calling package - final String packageName = getCallingPackage(); + final String packageName = getCallingPackageMaybeExtra(); final Cursor cursor = getContentResolver() .query(RecentsProvider.buildResume(packageName), null, null, null, null); try { @@ -783,6 +783,11 @@ public class DocumentsActivity extends Activity { return mState.stack.peek(); } + private String getCallingPackageMaybeExtra() { + final String extra = getIntent().getStringExtra(DocumentsContract.EXTRA_PACKAGE_NAME); + return (extra != null) ? extra : getCallingPackage(); + } + public Executor getCurrentExecutor() { final DocumentInfo cwd = getCurrentDirectory(); if (cwd != null && cwd.authority != null) { @@ -921,7 +926,7 @@ public class DocumentsActivity extends Activity { if (requestCode == CODE_FORWARD && resultCode != RESULT_CANCELED) { // Remember that we last picked via external app - final String packageName = getCallingPackage(); + final String packageName = getCallingPackageMaybeExtra(); final ContentValues values = new ContentValues(); values.put(ResumeColumns.EXTERNAL, 1); getContentResolver().insert(RecentsProvider.buildResume(packageName), values); @@ -1002,7 +1007,7 @@ public class DocumentsActivity extends Activity { } // Remember location for next app launch - final String packageName = getCallingPackage(); + final String packageName = getCallingPackageMaybeExtra(); values.clear(); values.put(ResumeColumns.STACK, rawStack); values.put(ResumeColumns.EXTERNAL, 0); |