From 14e5e1d3a6bcd89730c264aa2e1dd966651eebdf Mon Sep 17 00:00:00 2001
From: Suprabh Shukla <suprabh@google.com>
Date: Wed, 30 Aug 2017 16:39:21 -0700
Subject: [PATCH] Renaming string constants for intent action in tests

Test: forrest --extra_args='--class \
com.android.server.job.BackgroundRestrictionsTest' \
test FrameworksServicesTests

Change-Id: Icf111bafe807143027ce68fcfcef727ad34bc941
---
 .../com/android/server/job/BackgroundRestrictionsTest.java    | 3 +--
 .../servicestests/apps/jobtestapp/TestJobActivity.java        | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/services/tests/servicestests/src/com/android/server/job/BackgroundRestrictionsTest.java b/services/tests/servicestests/src/com/android/server/job/BackgroundRestrictionsTest.java
index 70d22745b3dc0..a1d8198b27774 100644
--- a/services/tests/servicestests/src/com/android/server/job/BackgroundRestrictionsTest.java
+++ b/services/tests/servicestests/src/com/android/server/job/BackgroundRestrictionsTest.java
@@ -32,7 +32,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.PackageManager;
 import android.os.IDeviceIdleController;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -182,7 +181,7 @@ public class BackgroundRestrictionsTest {
         }
     }
 
-    private void setAppOpsModeAllowed(boolean allow) throws PackageManager.NameNotFoundException {
+    private void setAppOpsModeAllowed(boolean allow) {
         mAppOpsManager.setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mTestPackageUid,
                 TEST_APP_PACKAGE, allow ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
     }
diff --git a/services/tests/servicestests/test-apps/JobTestApp/src/com/android/servicestests/apps/jobtestapp/TestJobActivity.java b/services/tests/servicestests/test-apps/JobTestApp/src/com/android/servicestests/apps/jobtestapp/TestJobActivity.java
index 94a85eee29a71..011817e997143 100644
--- a/services/tests/servicestests/test-apps/JobTestApp/src/com/android/servicestests/apps/jobtestapp/TestJobActivity.java
+++ b/services/tests/servicestests/test-apps/JobTestApp/src/com/android/servicestests/apps/jobtestapp/TestJobActivity.java
@@ -30,9 +30,9 @@ public class TestJobActivity extends Activity {
     public static final String EXTRA_JOB_ID_KEY =
             "com.android.servicestests.apps.jobtestapp.extra.JOB_ID";
     public static final String ACTION_START_JOB =
-            "com.android.servicestests.apps.jobtestapp.extra.START_JOB";
+            "com.android.servicestests.apps.jobtestapp.action.START_JOB";
     public static final String ACTION_CANCEL_JOBS =
-            "com.android.servicestests.apps.jobtestapp.extra.CANCEL_JOBS";
+            "com.android.servicestests.apps.jobtestapp.action.CANCEL_JOBS";
     public static final int JOB_INITIAL_BACKOFF = 10_000;
     public static final int JOB_MINIMUM_LATENCY = 5_000;