Adjust Chrome to normal behavior once user leaves special locale

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

 // Copyright 2015 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.chrome.browser;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
@@ skipping 375 matching lines @@
 
     @Override
     public void onStopWithNative() {
         super.onStopWithNative();
 
         if (getActivityTab() != null) getActivityTab().setIsAllowedToReturnToExternalApp(false);
 
         mTabModelSelectorImpl.saveState();
         StartupMetrics.getInstance().recordHistogram(true);
         mActivityStopMetrics.onStopWithNative(this);
+
+        mLocaleManager.stopObservePhoneStateChanges();

[Maria, 2016/10/04 03:48:41]

nit: how about calling these two methods

startObservingPhoneStateChanges and stopObservingPhoneStateChanges?

[Ian Wen, 2016/10/04 18:31:54]

Done.

     }
 
     @Override
     public void onStart() {
         super.onStart();
         StartupMetrics.getInstance().updateIntent(getIntent());
     }
 
     @Override
     public void onStartWithNative() {
         super.onStartWithNative();
         // If we don't have a current tab, show the overview mode.
         if (getActivityTab() == null) mLayoutManager.showOverview(false);
 
+        mLocaleManager.observePhoneStateChanges();
+
         resetSavedInstanceState();
     }
 
     @Override
     public void onNewIntentWithNative(Intent intent) {
         try {
             TraceEvent.begin("ChromeTabbedActivity.onNewIntentWithNative");
 
             super.onNewIntentWithNative(intent);
             if (CommandLine.getInstance().hasSwitch(ContentSwitches.ENABLE_TEST_INTENTS)) {
@@ skipping 1132 matching lines @@
     // TODO(mthiesse): Toggle toolbar overlay, popups, etc.
     public void setUIVisibilityForVR(int visibility) {
         mControlContainer.setVisibility(visibility);
         getCompositorViewHolder().getSurfaceView().setVisibility(visibility);
         getCompositorViewHolder().setVisibility(visibility);
 
         // Enter HTML5 fullscreen to ensure the texture fills the entire composited surface.
         getFullscreenManager().setPersistentFullscreenMode(visibility == View.GONE);
     }
 }