OSDN Git Service
Bill Yi [Tue, 24 Oct 2017 20:33:44 +0000 (20:33 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
aa8a972ea3
Change-Id: I778b023dfa65b0e4a8ab681c77a6a98c48184e93
Fan Zhang [Tue, 24 Oct 2017 20:33:03 +0000 (20:33 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
am:
2bcbc35b29
Change-Id: I37d5d73c9dc2dc64c6437c8e1a2786df616ee2f6
Bill Yi [Tue, 24 Oct 2017 18:32:26 +0000 (11:32 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Fan Zhang [Tue, 24 Oct 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
tiansiming [Tue, 24 Oct 2017 09:19:27 +0000 (17:19 +0800)]
Fix wrong position of cursor in OwnerInfoSettings
Bug:N/A
Test:Settings -> Security -> right settings icon of Screen lock
-> Lock screen message.
The cursor shows at the forefront of this EditText.
Change-Id: I86fe1bdbe78f700053e38b0cba4a5c8365af946e
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Jack Yu [Fri, 20 Oct 2017 19:30:29 +0000 (19:30 +0000)]
Merge "Refactored area update info support"
am:
60d6ffbc6c
Change-Id: I955c44c5d2c07dee0be7ae9990c0234eb989538f
Treehugger Robot [Fri, 20 Oct 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Refactored area update info support"
TreeHugger Robot [Fri, 20 Oct 2017 15:28:33 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Ben Schwartz [Fri, 20 Oct 2017 15:06:10 +0000 (15:06 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
am:
c8207de343
Change-Id: I688d2131294c2b4995d7f8f79e7819feb89573c3
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
Bill Yi [Fri, 20 Oct 2017 10:21:50 +0000 (03:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623
Jack Yu [Thu, 22 Jun 2017 00:43:43 +0000 (17:43 -0700)]
Refactored area update info support
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug:
37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit
c3cab8ecb84051abac144aaa0f94ee9276c89aab)
tiansiming [Thu, 19 Oct 2017 19:20:09 +0000 (19:20 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
am:
3a3044eeef
Change-Id: I26f1c35505538768a7816f038c44437fe9a08f67
Treehugger Robot [Thu, 19 Oct 2017 19:14:49 +0000 (19:14 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
tiansiming [Mon, 16 Oct 2017 13:32:20 +0000 (21:32 +0800)]
Fix wrong position of cursor in IccLockSettings
Position of cursor goes to the front when submit
an error pin.
Bug:https://issuetracker.google.com/issues/
67839176
Test:
1) Insert a sim card
2) Go to Settings -> Security -> Set up SIM card lock
3) press Lock SIM card checkbox
4) enter 123 and press OK button
Change-Id: I90655f3fa4cb3e4bda251cd0fc62e66300a4b66f
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Cai, Min1 [Mon, 16 Oct 2017 19:29:33 +0000 (19:29 +0000)]
Merge "Refresh payment preference while resume"
am:
05650bb3da
Change-Id: Ib4876e7d4f17b99699f3b7f328cd1b1eafb19eba
Maurice Lam [Mon, 16 Oct 2017 18:30:19 +0000 (11:30 -0700)]
resolve merge conflicts of
f36b25c2df to stage-aosp-master
Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
Daniel Nishi [Sun, 15 Oct 2017 03:47:13 +0000 (03:47 +0000)]
Merge "Fix PrivateVolumeSettings be launched repeatedly"
am:
31a7b2a4c7
Change-Id: I2ee1fe82349968182b21a716a36ac716c0425080
Treehugger Robot [Fri, 13 Oct 2017 23:10:13 +0000 (23:10 +0000)]
Merge "Refresh payment preference while resume"
Treehugger Robot [Fri, 13 Oct 2017 21:45:18 +0000 (21:45 +0000)]
Merge "There is no NEXT button in find sensor screen of fingerprint."
Daniel Nishi [Fri, 13 Oct 2017 17:52:58 +0000 (17:52 +0000)]
Merge "Fix PrivateVolumeSettings be launched repeatedly"
Cai, Min1 [Wed, 11 Oct 2017 08:31:22 +0000 (17:31 +0900)]
Refresh payment preference while resume
To show latest payment service list on Tap&pay menu.
Test: install payment service and go back to Tap&pay menu
Bug:
67718335
Change-Id: I6f421176b9c461898224b50d06f67a49645f0d18
Fan Zhang [Wed, 11 Oct 2017 21:01:23 +0000 (21:01 +0000)]
Merge "Move SettingsRobolectricTestRunner to testutils."
am:
16db22a9c8 -s ours
Change-Id: I7a4a2d5326b1e617beab32a4be4bfe5b7de7409a
Treehugger Robot [Wed, 11 Oct 2017 20:45:19 +0000 (20:45 +0000)]
Merge "Move SettingsRobolectricTestRunner to testutils."
Fan Zhang [Wed, 11 Oct 2017 19:22:56 +0000 (12:22 -0700)]
Move SettingsRobolectricTestRunner to testutils.
Change-Id: Ia0017983b844cabafc10478adf4839f5755f514c
Merged-In: I6612b1f26404587301c534c8ba60e39d59d6c840
Fixes:
67688380
Test: robotests
Li YanJia [Mon, 6 Feb 2017 06:50:56 +0000 (14:50 +0800)]
Fix PrivateVolumeSettings be launched repeatedly
Symptom:
After manually pull out the removable sd card or usb storage in
StorageSettings screen, it automatically moves to
PrivateVolumeSettings screen. This time, launching
PrivateVolumeSettings Activity is triggered six times and end-user
has to press back key six times to exit PrivateVolumeSettings
screen.
Root cause:
When sd card is pulled out, StorageSettings got three state change
event (UNMOUNTED, BAD_REMOVAL and onDiskDestroyed) through
StorageEventListener that triggers launching PrivateVolumeSettings
screen. In addition StorageSettings register the listener two
times, then StorageSettings receives six event in total.
Therefore, PrivateVolumeSettings screen is launched six times.
Solution:
Skip launching PrivateVolumeSettings if it's already triggered.
And removed the duplicated listener registration.
Bug:
67612903
Change-Id: Iabef51677a393977b7be29fc54aa050434213500
edgar.huang [Fri, 22 Sep 2017 09:31:38 +0000 (17:31 +0800)]
There is no NEXT button in find sensor screen of fingerprint.
Precondition: set the Font size and Display size to largest
Enter into the find sensor screen and the NEXT button is missing.
Test: manual - Enter into the find sensor screen -
and can find the NEXT button after sliding the screen.
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I8f6219ab22abad98111f016d633bf100dc3222ce
Ben Schwartz [Mon, 2 Oct 2017 22:16:15 +0000 (18:16 -0400)]
Add a developer option for controlling DNS over TLS
Bug:
63449024
Test: Manual. Appears to work.
Change-Id: I1b354c5cbfe761432235284232d993f028a8e18d
Carsten Hauge [Mon, 2 Oct 2017 18:03:40 +0000 (18:03 +0000)]
Merge "Avoid NullPointerException when updating preference intents"
am:
c4b0fa5858
Change-Id: I403d380ebfbbb0c70fdf5b6c9ff51267a5163e6f
Treehugger Robot [Mon, 2 Oct 2017 17:56:02 +0000 (17:56 +0000)]
Merge "Avoid NullPointerException when updating preference intents"
Carsten Hauge [Mon, 7 Jul 2014 07:36:07 +0000 (09:36 +0200)]
Avoid NullPointerException when updating preference intents
Comparisons changed on the intent action. Sometimes an account
preference intent does not have an action specified.
Fixes:
67075850
Test: manual - go to Settings > Users & accounts and tap an account.
Change-Id: I54cebbc983b55aa1487a122d37ccd5c79bbf519d
songkailun [Fri, 29 Sep 2017 09:37:17 +0000 (09:37 +0000)]
Merge "Fix wrong format in AndroidManifest.xml"
am:
de795d12d1
Change-Id: I443534ac7e122e337102d41c4138a0e94be72f7f
Treehugger Robot [Fri, 29 Sep 2017 06:45:30 +0000 (06:45 +0000)]
Merge "Fix wrong format in AndroidManifest.xml"
songkailun [Fri, 29 Sep 2017 01:42:05 +0000 (09:42 +0800)]
Fix wrong format in AndroidManifest.xml
N/A
Change-Id: Idf3b9c22e65d15013f5e3e2f5a1e9719d35ede3a
Signed-off-by: songkailun <songkailun@xiaomi.com>
Lei Yang [Tue, 26 Sep 2017 23:35:26 +0000 (23:35 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
am:
d2f42970bf
Change-Id: Iecac3e7e8a04356f377a2d8886bb86f70c0ab96e
Treehugger Robot [Tue, 26 Sep 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
Lei Yang [Mon, 13 Feb 2017 02:39:29 +0000 (10:39 +0800)]
Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled
"Set up Wi-Fi NFC Tag" dialog cannot be scrolled and "Show password"
is not displayed when setting Font size and Display size to Largest.
To fix this issue, ScrollView should be added.
Fixes:
66936807
Test: manual - long tap a connected Wi-Fi AP and
tap "Write to NFC tag".
Change-Id: I3edcf3c2b9db47319e18405066bcb835b064b690
Colin Cross [Tue, 26 Sep 2017 01:18:50 +0000 (01:18 +0000)]
Merge "Remove unnecessary core-oj library"
am:
a37bf5616a
Change-Id: I9a2fa6cb15e5a908f37f6a85967f93419f5e22db
Treehugger Robot [Tue, 26 Sep 2017 01:12:30 +0000 (01:12 +0000)]
Merge "Remove unnecessary core-oj library"
Colin Cross [Sun, 24 Sep 2017 05:09:31 +0000 (22:09 -0700)]
Remove unnecessary core-oj library
core-oj is part of the default java libraries and should not be
explicitly included by a package.
Test: m -j checkbuild
Change-Id: Idccd326ebbbfb9121ce556037e79c173bfd08580
Doris Ling [Thu, 21 Sep 2017 19:24:52 +0000 (19:24 +0000)]
Merge "Fix NPE crash in UsageAccessDetails"
am:
cd959f28a0
Change-Id: I21f898f7ec8fd67d4f29d73491b4ac57cad7a252
Doris Ling [Thu, 21 Sep 2017 19:21:03 +0000 (19:21 +0000)]
Merge "Fix NPE crash in UsageAccessDetails"
tiansiming [Tue, 19 Sep 2017 10:16:19 +0000 (18:16 +0800)]
Fix NPE crash in UsageAccessDetails
mPackageInfo will be null in RefreshUI method in UsageAccessDetails.java
Bug:https://issuetracker.google.com/issues/
65872768
Test:As explained in the link above
Change-Id: I8bd4b822cfe5d8a3347ca7f5886605cbdfb9b8b6
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Doris Ling [Fri, 15 Sep 2017 01:33:16 +0000 (01:33 +0000)]
Merge "Default apps settings disappear when switching to secondary user"
am:
939265d6ea
Change-Id: I8f874e741b950079482c3c09eb7ec1c3ac5f57fd
Doris Ling [Thu, 14 Sep 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Default apps settings disappear when switching to secondary user"
edgar.huang [Thu, 14 Sep 2017 20:37:15 +0000 (20:37 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
am:
62a021850f
Change-Id: I6baf91aa5b558616e3d30aaa2edbdbc0f47072c3
Treehugger Robot [Thu, 14 Sep 2017 20:28:55 +0000 (20:28 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
Erik Kline [Thu, 14 Sep 2017 08:14:09 +0000 (08:14 +0000)]
Merge changes Icd3d09aa,I4b070964
am:
a0661c4fdf
Change-Id: Id00f5518b6377fd0a6101b8393b4d68da3e02642
Treehugger Robot [Thu, 14 Sep 2017 08:10:25 +0000 (08:10 +0000)]
Merge changes Icd3d09aa,I4b070964
* changes:
Include IPv6 DNS servers in wifi details
Separate multiple DNS addresses with newlines.
Erik Kline [Wed, 6 Sep 2017 09:05:48 +0000 (18:05 +0900)]
Include IPv6 DNS servers in wifi details
Test: as follows
- built
- flashed
- booted
- export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
make -j RunSettingsRoboTests
RunSettingsRoboTests:
RunSettingsRoboTests: Time: 19.821
RunSettingsRoboTests:
RunSettingsRoboTests: OK (37 tests)
RunSettingsRoboTests:
- make -j RunSettingsRoboTests
RunSettingsRoboTests: ...........................
RunSettingsRoboTests: Time: 424.847
RunSettingsRoboTests:
RunSettingsRoboTests: OK (2250 tests)
RunSettingsRoboTests:
Bug:
65037256
Bug:
65467586
Merged-In: If15181d557e9abce75111a6e1fff4e12586d7dbc
Merged-In: I55fbd611fee9f17215412a76b480cdee96f62b32
Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
(cherry picked from commit
9adc5887490953c6d239a634d6ebca4cd3081dc6)
Sundeep Ghuman [Tue, 29 Aug 2017 00:20:02 +0000 (17:20 -0700)]
Separate multiple DNS addresses with newlines.
Bug: b/
65037256
Bug:
65037256
Test: make -j40 RunSettingsRoboTests
Merged-In: I676b5de60477f7c905b08b8bb361104e5f1e05b9
Merged-In: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
(cherry picked from commit
2716e841be8e8bda36c451e1ba9651b37eead560)
Peng Du [Thu, 3 Aug 2017 11:35:53 +0000 (19:35 +0800)]
Default apps settings disappear when switching to secondary user
When switching to a secondary user, Settings will disable all extra
categories that aren't configured in SETTINGS_FOR_RESTRICTED.
As the result, Default apps settings disappear.
To fix this issue, AdvancedAppsActivity class of Default apps settings
should be added to SETTINGS_FOR_RESTRICTED.
Fixes:
65616610
Test: manual - switch to a secondary user
and go to Settings > Apps & notifications.
Change-Id: Ie9f3b1d215e2e43bf25b8dd2971f86bd60e94d04
edgar.huang [Wed, 13 Sep 2017 03:04:01 +0000 (11:04 +0800)]
Don't need to authenticate fingerprint when the fingerprint list is empty.
Enter into the fingerprint list screen and can authenticate fingerprint still when the list is empty.
Test: manual - enrolling some fingerprints and remove all fingerprintd, touch the fingerprint touch panel and no response.
debesay guadad [Mon, 11 Sep 2017 20:09:47 +0000 (20:09 +0000)]
Merge "Add ims registration status"
am:
9b7479f8a9 -s ours
Change-Id: I65a6d75b2f2127929794c320fe7596372dd4c6ac
Treehugger Robot [Mon, 11 Sep 2017 19:44:31 +0000 (19:44 +0000)]
Merge "Add ims registration status"
Brad Ebinger [Mon, 11 Sep 2017 19:42:37 +0000 (19:42 +0000)]
Merge "Add ims registration status" into stage-aosp-master
Amit Mahajan [Mon, 11 Sep 2017 17:37:55 +0000 (17:37 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed."
am:
c2c0edff09
Change-Id: If53f719245876dda59b220a9b066f30f1c1e0fbc
Treehugger Robot [Mon, 11 Sep 2017 17:21:07 +0000 (17:21 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed."
Amit Mahajan [Thu, 31 Aug 2017 20:59:20 +0000 (13:59 -0700)]
Change to disable mvno data field in ApnEditor if needed.
Test: manual
Bug:
65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
daqi [Fri, 8 Sep 2017 10:04:17 +0000 (10:04 +0000)]
Merge "Fix TrustedCredentialsSettings NPE"
am:
c9e532f508
Change-Id: I2ce8ea95abbbd1d522be4897069d4515354d3b14
Treehugger Robot [Fri, 8 Sep 2017 09:56:31 +0000 (09:56 +0000)]
Merge "Fix TrustedCredentialsSettings NPE"
debesay guadad [Fri, 26 Feb 2016 06:49:27 +0000 (14:49 +0800)]
Add ims registration status
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.
Test: manual Checked "IMS registration state" in Status menu
Bug:
28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
debesay guadad [Fri, 26 Feb 2016 06:49:27 +0000 (14:49 +0800)]
Add ims registration status
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.
Test: manual Checked "IMS registration state" in Status menu
Bug:
28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
daqi [Tue, 5 Sep 2017 01:53:05 +0000 (09:53 +0800)]
Fix TrustedCredentialsSettings NPE
[Cause of Defect]
TrustedCredentialsSettings#mKeyChainConnectionByProfileId is get/set by
more than one thread. Main thread would set it in onDestroy method, and
AsyncTask would get and set in the doInBackground method. So
mKeyChainConnectionByProfileId.get(profileId) would get null after
onDestroy method get called.
Bug: N/A
Test: Debugger to simulate concurrency
Change-Id: I0664d1e9b88b079855354ce0e6fe014a98a22327
Signed-off-by: daqi <daqi@xiaomi.com>
edgar.huang [Wed, 6 Sep 2017 00:21:17 +0000 (00:21 +0000)]
Merge "Settings is crashed high probability when doing follow steps"
am:
2584202cb7
Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46
Treehugger Robot [Wed, 6 Sep 2017 00:12:44 +0000 (00:12 +0000)]
Merge "Settings is crashed high probability when doing follow steps"
edgar.huang [Thu, 31 Aug 2017 03:22:25 +0000 (11:22 +0800)]
Settings is crashed high probability when doing follow steps
Enter into the fingerprint list screen and delete and identification of operation at the same time, when the item of the fingerprint verification was deleted, highlighting the item to be deleted, just so NullPointerException occurred.
Test: manual - enrolling a fingerprint and do above steps.
Colin Cross [Thu, 31 Aug 2017 22:24:00 +0000 (22:24 +0000)]
Merge "Fix errorprone build"
am:
0bed3cacd7 -s ours
Change-Id: I3c6b80920db044b842946e373dbc1efddd260de8
Treehugger Robot [Thu, 31 Aug 2017 22:16:52 +0000 (22:16 +0000)]
Merge "Fix errorprone build"
Maurice Lam [Thu, 31 Aug 2017 02:10:37 +0000 (02:10 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
am:
108611ff34
Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b
Maurice Lam [Thu, 31 Aug 2017 02:04:01 +0000 (02:04 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
Colin Cross [Tue, 29 Aug 2017 19:14:54 +0000 (12:14 -0700)]
Fix errorprone build
Fixes:
packages/apps/Settings/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java:95: error: [MockitoCast] A bug in Mockito will cause this test to fail at runtime with a ClassCastException
when(mContext.getSystemService(AutofillManager.class)).thenReturn(mAutofillManager);
^
(see http://errorprone.info/bugpattern/MockitoCast)
Did you mean 'when((Object) mContext.getSystemService(AutofillManager.class)).thenReturn(mAutofillManager);'?
packages/apps/Settings/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java:195: error: [JUnit4TestNotRun] Test method will not be run; please add @Test annotation
public void testBindViewElements_appSearchResult() {
^
(see http://errorprone.info/bugpattern/JUnit4TestNotRun)
Did you mean '@Test'?
Bug:
64489631
Test: m -j RUN_ERROR_PRONE=true javac-check
Merged-In: I79477f331ae447d2505a1519da09886bf07ba1a2
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I8fd30fc741927de3f6527aca6d98d8851ef23794
liming.wang [Thu, 27 Oct 2016 02:00:34 +0000 (10:00 +0800)]
Fix Settings crashes after tapping "Learn more" in fingerprint page
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.
Fixes:
64322876
Test: manual - go to Settings > Security & Location > Fingerprint
and then tap "Learn more"
Change-Id: I70beca880261df0ee3eef94f5469f44130ffd95a
Amit Mahajan [Tue, 22 Aug 2017 23:47:07 +0000 (23:47 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052 am:
b2498bc422
am:
f70f53473a
Change-Id: Id3fd20f5156e233b4e0fe41c6a30f89f08b038db
TreeHugger Robot [Tue, 22 Aug 2017 23:31:10 +0000 (23:31 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb am:
b87acf6837
am:
a81a339c1d -s ours
Change-Id: Ic593111485af94e822cf2644d7e5bf5348287f1a
Amit Mahajan [Tue, 22 Aug 2017 21:19:52 +0000 (21:19 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052
am:
b2498bc422
Change-Id: I78ab5bbe68ada65f8691cda55fc6b1db0f708aac
Amit Mahajan [Tue, 22 Aug 2017 21:09:12 +0000 (21:09 +0000)]
Merge "Change to not cache user entered apn type as user may change it."
am:
54eeafa052
Change-Id: I33e32ee2d4a9e09f1fb6c383eb7e1d7e8a081c2c
Treehugger Robot [Tue, 22 Aug 2017 21:02:03 +0000 (21:02 +0000)]
Merge "Change to not cache user entered apn type as user may change it."
TreeHugger Robot [Tue, 22 Aug 2017 20:20:19 +0000 (20:20 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb
am:
b87acf6837
Change-Id: I477a4d7bc1002f01c610f232778067e3beb9c9cf
TreeHugger Robot [Tue, 22 Aug 2017 20:03:24 +0000 (20:03 +0000)]
Merge changes from topic "Read dun APNs from apn db"
am:
f9390ce1fb
Change-Id: I1dd0a753bb08f7db6f36a7162b9f7f81a1c0406c
Treehugger Robot [Tue, 22 Aug 2017 19:52:21 +0000 (19:52 +0000)]
Merge changes from topic "Read dun APNs from apn db"
* changes:
Change empty apn type in user entered APN to non-read-only types.
Check for null mReadOnlyApnTypes.
Disallow adding/editing dun APNs unless allowed by carrier.
Amit Mahajan [Wed, 2 Aug 2017 16:59:03 +0000 (09:59 -0700)]
Change to not cache user entered apn type as user may change it.
Test: manual
Bug:
64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
TreeHugger Robot [Mon, 19 Jun 2017 23:21:12 +0000 (23:21 +0000)]
Change empty apn type in user entered APN to non-read-only types.
Test: Manually added APN and verified read-only and non-wildcardable
types are not included
Bug:
38186417
Change-Id: I07bcf1c2a950a1257446f0a7beb602fed79423b3
Amit Mahajan [Thu, 1 Jun 2017 23:39:40 +0000 (16:39 -0700)]
Check for null mReadOnlyApnTypes.
Test: none
Bug:
62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
Amit Mahajan [Wed, 10 May 2017 05:31:13 +0000 (22:31 -0700)]
Disallow adding/editing dun APNs unless allowed by carrier.
Test: WIP
Bug:
38186417
Change-Id: If1cc34ad979659a56a3886da2a02fdbf642739ac
Bill Yi [Fri, 18 Aug 2017 01:50:29 +0000 (01:50 +0000)]
Import translations. DO NOT MERGE am:
4ced4787ce -s ours
am:
5b9b88cc5b -s ours
Change-Id: I40b762159141b73056cc04ceb18e084d49e53723
Bill Yi [Fri, 18 Aug 2017 01:45:26 +0000 (01:45 +0000)]
Import translations. DO NOT MERGE
am:
4ced4787ce -s ours
Change-Id: Ie0c11be879fc1d31d8053de2b73f578143df7d7f
Bill Yi [Thu, 17 Aug 2017 23:57:35 +0000 (16:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64086495
Change-Id: I4e5c4860eae1b41fea7a34a88b53630d86745e8e
Suprabh Shukla [Wed, 16 Aug 2017 21:24:02 +0000 (21:24 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours am:
202970aa92 -s ours am:
81ba0cc873 -s ours am:
82afc6c5fd -s ours am:
23e185adf8 -s ours am:
5d4a2bb844 -s ours am:
b4678ce1d2 -s ours
am:
9a416573d7 -s ours
Change-Id: I2a81249795e44842ebe8ef3ff5f4aab62ff3e6cc
Suprabh Shukla [Wed, 16 Aug 2017 21:23:05 +0000 (21:23 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours am:
de8e1f4be5 -s ours am:
b2f5566de5 -s ours am:
05fec2162a -s ours am:
df39274478 -s ours am:
a6b4e032c8 -s ours am:
28f6dd01bc -s ours
am:
8fe20711fa -s ours
Change-Id: I3448fc6d16584807cefbcdca45be0efe022702c8
Suprabh Shukla [Wed, 16 Aug 2017 21:22:17 +0000 (21:22 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours am:
817c35056c -s ours am:
6d7bb4c4d0 -s ours am:
3dd026d5dc -s ours am:
142433924f -s ours am:
0e22588ed0 -s ours
am:
bbe3047d1d -s ours
Change-Id: I7233624570a758b4e7e8dfc6410401cfbde11df8
Suprabh Shukla [Wed, 16 Aug 2017 20:51:19 +0000 (20:51 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours am:
202970aa92 -s ours am:
81ba0cc873 -s ours am:
82afc6c5fd -s ours am:
23e185adf8 -s ours am:
5d4a2bb844 -s ours am:
b4678ce1d2 -s ours
am:
d430178ba4 -s ours
Change-Id: If72ef8b01ef6a90c4752710b5568eeea2bb63796
Suprabh Shukla [Wed, 16 Aug 2017 20:50:39 +0000 (20:50 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours am:
de8e1f4be5 -s ours am:
b2f5566de5 -s ours am:
05fec2162a -s ours am:
df39274478 -s ours am:
a6b4e032c8 -s ours am:
28f6dd01bc -s ours
am:
c62f6f30bc -s ours
Change-Id: Iabba05d1d43a40d35e0ce198879d91410440d7b1
Suprabh Shukla [Wed, 16 Aug 2017 20:48:07 +0000 (20:48 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours am:
817c35056c -s ours am:
6d7bb4c4d0 -s ours am:
3dd026d5dc -s ours am:
142433924f -s ours am:
0e22588ed0 -s ours
am:
5575d285db -s ours
Change-Id: I6f5163890c6a333d9c1dba9ed2c63c364acb6cce
Suprabh Shukla [Wed, 16 Aug 2017 20:42:38 +0000 (20:42 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours am:
202970aa92 -s ours am:
81ba0cc873 -s ours am:
82afc6c5fd -s ours am:
23e185adf8 -s ours am:
5d4a2bb844 -s ours
am:
b4678ce1d2 -s ours
Change-Id: I199cfbc0ec36904483c35aa9712ab471cf5b4ec2
Suprabh Shukla [Wed, 16 Aug 2017 20:41:48 +0000 (20:41 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours am:
de8e1f4be5 -s ours am:
b2f5566de5 -s ours am:
05fec2162a -s ours am:
df39274478 -s ours am:
a6b4e032c8 -s ours
am:
28f6dd01bc -s ours
Change-Id: If16f17e144156b08dc9fea587178cad18dc370e7
Suprabh Shukla [Wed, 16 Aug 2017 20:40:59 +0000 (20:40 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours am:
817c35056c -s ours am:
6d7bb4c4d0 -s ours am:
3dd026d5dc -s ours am:
142433924f -s ours
am:
0e22588ed0 -s ours
Change-Id: I7243a50b7d64e1ee63d85e4ce5467217c76d7bce
Suprabh Shukla [Wed, 16 Aug 2017 20:39:42 +0000 (20:39 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours am:
202970aa92 -s ours am:
81ba0cc873 -s ours am:
82afc6c5fd -s ours am:
23e185adf8 -s ours am:
5d4a2bb844 -s ours
am:
b4678ce1d2 -s ours
Change-Id: I350b04feb64b26fddbf366cd31d42d30ef0e02aa
Suprabh Shukla [Wed, 16 Aug 2017 20:38:24 +0000 (20:38 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours am:
de8e1f4be5 -s ours am:
b2f5566de5 -s ours am:
05fec2162a -s ours am:
df39274478 -s ours am:
a6b4e032c8 -s ours
am:
28f6dd01bc -s ours
Change-Id: Ia95e462a6e007f0e87cfddb75b13f8ee7a89971a
Suprabh Shukla [Wed, 16 Aug 2017 20:37:36 +0000 (20:37 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours am:
817c35056c -s ours am:
6d7bb4c4d0 -s ours am:
3dd026d5dc -s ours am:
142433924f -s ours
am:
0e22588ed0 -s ours
Change-Id: I8025d40c5c1b3b6992d759a7f6a5355207236dff