Skip device index job if caller is not Settings app.

Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Fixes: 109713077
Test: robotests
(cherry picked from commit 74ba1a51d7)
(cherry picked from commit 9ecf3e0c11)
This commit is contained in:
Fan Zhang
2018-05-30 09:50:52 -07:00
committed by android-build-team Robot
parent da294f14cd
commit 23059f5e5a
2 changed files with 60 additions and 20 deletions

View File

@@ -21,7 +21,10 @@ import android.app.job.JobInfo;
import android.app.job.JobScheduler; import android.app.job.JobScheduler;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
@@ -36,7 +39,6 @@ import java.util.Locale;
public interface DeviceIndexFeatureProvider { public interface DeviceIndexFeatureProvider {
String TAG = "DeviceIndex"; String TAG = "DeviceIndex";
String INDEX_VERSION = "settings:index_version"; String INDEX_VERSION = "settings:index_version";
@@ -57,7 +59,7 @@ public interface DeviceIndexFeatureProvider {
default void updateIndex(Context context, boolean force) { default void updateIndex(Context context, boolean force) {
if (!isIndexingEnabled()) { if (!isIndexingEnabled()) {
Log.w(TAG, "Skipping: device index is not enabled"); Log.i(TAG, "Skipping: device index is not enabled");
return; return;
} }
@@ -66,7 +68,29 @@ public interface DeviceIndexFeatureProvider {
return; return;
} }
final ComponentName jobComponent = new ComponentName(context.getPackageName(),
DeviceIndexUpdateJobService.class.getName());
try {
final int callerUid = Binder.getCallingUid();
final ServiceInfo si = context.getPackageManager().getServiceInfo(jobComponent,
PackageManager.MATCH_DIRECT_BOOT_AWARE
| PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
if (si == null) {
Log.w(TAG, "Skipping: No such service " + jobComponent);
return;
}
if (si.applicationInfo.uid != callerUid) {
Log.w(TAG, "Skipping: Uid cannot schedule DeviceIndexUpdate: " + callerUid);
return;
}
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Skipping: error finding DeviceIndexUpdateJobService from packageManager");
return;
}
if (!force && skipIndex(context)) { if (!force && skipIndex(context)) {
Log.i(TAG, "Skipping: already indexed.");
// No need to update. // No need to update.
return; return;
} }
@@ -74,8 +98,6 @@ public interface DeviceIndexFeatureProvider {
// Prevent scheduling multiple jobs // Prevent scheduling multiple jobs
setIndexState(context); setIndexState(context);
final ComponentName jobComponent = new ComponentName(context.getPackageName(),
DeviceIndexUpdateJobService.class.getName());
final int jobId = context.getResources().getInteger(R.integer.device_index_update); final int jobId = context.getResources().getInteger(R.integer.device_index_update);
// Schedule a job so that we know it'll be able to complete, but try to run as // Schedule a job so that we know it'll be able to complete, but try to run as
// soon as possible. // soon as possible.

View File

@@ -15,7 +15,6 @@
package com.android.settings.search; package com.android.settings.search;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -23,27 +22,42 @@ import static org.mockito.Mockito.when;
import android.app.Activity; import android.app.Activity;
import android.app.job.JobScheduler; import android.app.job.JobScheduler;
import android.os.Binder;
import android.provider.Settings; import android.provider.Settings;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.shadows.ShadowBinder;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
public class DeviceIndexFeatureProviderTest { public class DeviceIndexFeatureProviderTest {
@Mock
private JobScheduler mJobScheduler;
private DeviceIndexFeatureProvider mProvider; private DeviceIndexFeatureProvider mProvider;
private Activity mActivity; private Activity mActivity;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowBinder.reset();
FakeFeatureFactory.setupForTest(); FakeFeatureFactory.setupForTest();
mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get()); mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get());
mProvider = spy(new DeviceIndexFeatureProviderImpl()); mProvider = spy(new DeviceIndexFeatureProviderImpl());
when(mActivity.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler);
}
@After
public void tearDown() {
ShadowBinder.reset();
} }
@Test @Test
@@ -51,7 +65,7 @@ public class DeviceIndexFeatureProviderTest {
when(mProvider.isIndexingEnabled()).thenReturn(false); when(mProvider.isIndexingEnabled()).thenReturn(false);
mProvider.updateIndex(mActivity, false); mProvider.updateIndex(mActivity, false);
verify(mProvider, never()).index(any(), any(), any(), any(), any()); verify(mJobScheduler, never()).schedule(any());
} }
@Test @Test
@@ -62,19 +76,17 @@ public class DeviceIndexFeatureProviderTest {
mProvider.updateIndex(mActivity, false); mProvider.updateIndex(mActivity, false);
verify(mProvider, never()).index(any(), any(), any(), any(), any()); verify(mJobScheduler, never()).schedule(any());
} }
@Test @Test
public void updateIndex_enabled_provisioned_shouldIndex() { public void updateIndex_enabled_provisioned_shouldIndex() {
Settings.Global.putInt(mActivity.getContentResolver(), Settings.Global.putInt(mActivity.getContentResolver(),
Settings.Global.DEVICE_PROVISIONED, 1); Settings.Global.DEVICE_PROVISIONED, 1);
JobScheduler jobScheduler = mock(JobScheduler.class);
when(mProvider.isIndexingEnabled()).thenReturn(true); when(mProvider.isIndexingEnabled()).thenReturn(true);
when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler);
mProvider.updateIndex(mActivity, false); mProvider.updateIndex(mActivity, false);
verify(jobScheduler).schedule(any()); verify(mJobScheduler).schedule(any());
} }
@Test @Test
@@ -87,12 +99,22 @@ public class DeviceIndexFeatureProviderTest {
Settings.Global.putString(mActivity.getContentResolver(), Settings.Global.putString(mActivity.getContentResolver(),
DeviceIndexFeatureProvider.LANGUAGE.toString(), DeviceIndexFeatureProvider.LANGUAGE.toString(),
DeviceIndexFeatureProvider.INDEX_LANGUAGE); DeviceIndexFeatureProvider.INDEX_LANGUAGE);
JobScheduler jobScheduler = mock(JobScheduler.class);
when(mProvider.isIndexingEnabled()).thenReturn(true); when(mProvider.isIndexingEnabled()).thenReturn(true);
when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler);
mProvider.updateIndex(mActivity, false); mProvider.updateIndex(mActivity, false);
verify(jobScheduler).schedule(any()); verify(mJobScheduler).schedule(any());
}
@Test
public void updateIndex_enabled_provisioned_differentUid_shouldNotIndex() {
Settings.Global.putInt(mActivity.getContentResolver(),
Settings.Global.DEVICE_PROVISIONED, 1);
when(mProvider.isIndexingEnabled()).thenReturn(true);
ShadowBinder.setCallingUid(Binder.getCallingUid() + 2000);
mProvider.updateIndex(mActivity, false);
verify(mJobScheduler, never()).schedule(any());
} }
@Test @Test
@@ -102,12 +124,11 @@ public class DeviceIndexFeatureProviderTest {
DeviceIndexFeatureProvider.setIndexState(mActivity); DeviceIndexFeatureProvider.setIndexState(mActivity);
Settings.Global.putString(mActivity.getContentResolver(), Settings.Global.putString(mActivity.getContentResolver(),
DeviceIndexFeatureProvider.INDEX_LANGUAGE, "new language"); DeviceIndexFeatureProvider.INDEX_LANGUAGE, "new language");
JobScheduler jobScheduler = mock(JobScheduler.class);
when(mProvider.isIndexingEnabled()).thenReturn(true); when(mProvider.isIndexingEnabled()).thenReturn(true);
when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler);
mProvider.updateIndex(mActivity, false); mProvider.updateIndex(mActivity, false);
verify(jobScheduler).schedule(any()); verify(mJobScheduler).schedule(any());
} }
@Test @Test
@@ -120,11 +141,8 @@ public class DeviceIndexFeatureProviderTest {
// Same build and same language // Same build and same language
DeviceIndexFeatureProvider.setIndexState(mActivity); DeviceIndexFeatureProvider.setIndexState(mActivity);
final JobScheduler jobScheduler = mock(JobScheduler.class);
when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler);
mProvider.updateIndex(mActivity, false); mProvider.updateIndex(mActivity, false);
verify(jobScheduler, never()).schedule(any()); verify(mJobScheduler, never()).schedule(any());
} }
} }