chrome[android]: Restrict the use of startService for invalidations.

components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.components.invalidation;
 
 import android.accounts.Account;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 
 import com.google.ipc.invalidation.external.client.InvalidationListener.RegistrationState;
 import com.google.ipc.invalidation.external.client.contrib.AndroidListener;
 import com.google.ipc.invalidation.external.client.types.ErrorInfo;
 import com.google.ipc.invalidation.external.client.types.Invalidation;
 import com.google.ipc.invalidation.external.client.types.ObjectId;
 import com.google.protos.ipc.invalidation.Types.ClientType;
 
 import org.chromium.base.ApplicationStatus;
+import org.chromium.base.BuildInfo;
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.AndroidSyncSettings;
 import org.chromium.components.sync.ModelTypeHelper;
 import org.chromium.components.sync.SyncConstants;
 import org.chromium.components.sync.notifier.InvalidationClientNameProvider;
@@ skipping 275 matching lines @@
     }
 
     /**
      * Starts a new client, destroying any existing client. {@code owningAccount} is the account
      * of the user for which the client is being created; it will be persisted using
      * {@link InvalidationPreferences#setAccount}.
      */
     private void startClient() {
         byte[] clientName = InvalidationClientNameProvider.get().getInvalidatorClientName();
         Intent startIntent = AndroidListener.createStartIntent(this, CLIENT_TYPE, clientName);
+
+        if (shouldRestrictBackgroundServices()) {
+            Log.e(TAG, "Failed to start client");
+            return;
+        }
         startService(startIntent);
         setIsClientStarted(true);
     }
 
     /** Stops the notification client. */
     private void stopClient() {
+        if (shouldRestrictBackgroundServices()) {
+            Log.e(TAG, "Failed to stop client");
+            return;
+        }
         startService(AndroidListener.createStopIntent(this));
         setIsClientStarted(false);
         setClientId(null);
     }
 
     /** Sets the saved sync account in {@link InvalidationPreferences} to {@code owningAccount}. */
     private void setAccount(Account owningAccount) {
         InvalidationPreferences invPrefs = new InvalidationPreferences();
         EditContext editContext = invPrefs.edit();
         invPrefs.setAccount(editContext, owningAccount);
@@ skipping 197 matching lines @@
         return "oauth2:" + SyncConstants.CHROME_SYNC_OAUTH2_SCOPE;
     }
 
     private static void setClientId(byte[] clientId) {
         sClientId = clientId;
     }
 
     private static void setIsClientStarted(boolean isStarted) {
         sIsClientStarted = isStarted;
     }
+
+    private boolean shouldRestrictBackgroundServices() {
+        // Restricts the use of background services when not in foreground. See crbug.com/680812.
+        return BuildInfo.isGreaterThanN() && !isChromeInForeground();

[Nicolas Zea, 2017/03/30 18:39:35]

Looks like this will actually return true when the device is running NMR1
https://cs.chromium.org/chromium/src/base/android/java/src/org/chromium/base/...

Is that expected? Should this instead be calling isAtLeastO?

[Khushal, 2017/03/30 19:13:16]

This looks like an error. It should be isAtLeastO. If we fail to stop the client
here, for O tango would stop because android would throw an exception if we try
to start a service, but on N the client would keep running.

+    }
 }