Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle failure to create file." into nyc-dev

Browse Source
This commit is contained in:
Philip P. Moltmann
2016-05-12 16:16:39 +00:00
committed by Android (Google) Code Review
parent df15e03ed0 e05a7b71c6
commit 808f2c361a
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/PrintSpooler/res/values/strings.xml
View File

@@ -150,6 +150,9 @@
<!-- Description of printer info icon. [CHAR LIMIT=50] -->
<string name="printer_info_desc">More information about this printer</string>
<!-- Notification that we could not create a file name for the printed PDF. [CHAR LIMIT=50] -->
<string name="could_not_create_file">Could not create file</string>
<!-- Notification that print services as disabled. [CHAR LIMIT=50] -->
<string name="print_services_disabled_toast">Some print services are disabled</string>

11
packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
View File

@@ -84,6 +84,7 @@ import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.printspooler.R;
import com.android.printspooler.model.MutexFileProvider;
@@ -658,7 +659,15 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
intent.setType("application/pdf");
intent.putExtra(Intent.EXTRA_TITLE, info.getName());
intent.putExtra(DocumentsContract.EXTRA_PACKAGE_NAME, mCallingPackageName);
startActivityForResult(intent, ACTIVITY_REQUEST_CREATE_FILE);
try {
startActivityForResult(intent, ACTIVITY_REQUEST_CREATE_FILE);
} catch (Exception e) {
Log.e(LOG_TAG, "Could not create file", e);
Toast.makeText(this, getString(R.string.could_not_create_file),
Toast.LENGTH_SHORT).show();
onStartCreateDocumentActivityResult(RESULT_CANCELED, null);
}
}
private void onStartCreateDocumentActivityResult(int resultCode, Intent data) {