PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,168 Commits 1 Branch 0 Tags
4ca4bd31c3d19c445876b1ce7335b49b7d0dbbcc
Commit Graph

38168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peng Du
f1f7dcb2f5 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
 2017-09-13 09:57:25 +00:00
edgar.huang
bbd47bd460 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.
 2017-09-13 11:04:01 +08:00
debesay guadad
d3c72406b6 Merge "Add ims registration status" 
am: 9b7479f8a9  -s ours

Change-Id: I65a6d75b2f2127929794c320fe7596372dd4c6ac
 2017-09-11 20:09:47 +00:00
Treehugger Robot
9b7479f8a9 Merge "Add ims registration status" 2017-09-11 19:44:31 +00:00
Brad Ebinger
af845720f6 Merge "Add ims registration status" into stage-aosp-master 2017-09-11 19:42:37 +00:00
Amit Mahajan
6ca28e8362 Merge "Change to disable mvno data field in ApnEditor if needed." 
am: c2c0edff09

Change-Id: If53f719245876dda59b220a9b066f30f1c1e0fbc
 2017-09-11 17:37:55 +00:00
Treehugger Robot
c2c0edff09 Merge "Change to disable mvno data field in ApnEditor if needed." 2017-09-11 17:21:07 +00:00
Amit Mahajan
ad8eba3097 Change to disable mvno data field in ApnEditor if needed. 
Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
 2017-09-11 09:08:49 -07:00
daqi
93860b298b Merge "Fix TrustedCredentialsSettings NPE" 
am: c9e532f508

Change-Id: I2ce8ea95abbbd1d522be4897069d4515354d3b14
 2017-09-08 10:04:17 +00:00
Treehugger Robot
c9e532f508 Merge "Fix TrustedCredentialsSettings NPE" 2017-09-08 09:56:31 +00:00
debesay guadad
d6bddbc4db 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
 2017-09-07 21:03:06 +00:00
debesay guadad
96dc322901 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
 2017-09-07 20:59:32 +00:00
daqi
be47df7395 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>
 2017-09-07 17:21:25 +08:00
edgar.huang
8f42d1a4ab Merge "Settings is crashed high probability when doing follow steps" 
am: 2584202cb7

Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46
 2017-09-06 00:21:17 +00:00
Treehugger Robot
2584202cb7 Merge "Settings is crashed high probability when doing follow steps" 2017-09-06 00:12:44 +00:00
edgar.huang
ab6f11f47f 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.
 2017-09-05 06:35:27 +00:00
Colin Cross
a1bcb02184 Merge "Fix errorprone build" 
am: 0bed3cacd7  -s ours

Change-Id: I3c6b80920db044b842946e373dbc1efddd260de8
 2017-08-31 22:24:00 +00:00
Treehugger Robot
0bed3cacd7 Merge "Fix errorprone build" 2017-08-31 22:16:52 +00:00
Maurice Lam
61c8796a5e Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" 
am: 108611ff34

Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b
 2017-08-31 02:10:37 +00:00
Maurice Lam
108611ff34 Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" 2017-08-31 02:04:01 +00:00
Colin Cross
1ef4caaf3f 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
 2017-08-29 12:57:06 -07:00
liming.wang
0db5a99608 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
 2017-08-23 03:32:40 +00:00
Amit Mahajan
4bb56f5282 Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052 am: b2498bc422 
am: f70f53473a

Change-Id: Id3fd20f5156e233b4e0fe41c6a30f89f08b038db
 2017-08-22 23:47:07 +00:00
TreeHugger Robot
a211db7af3 Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb am: b87acf6837 
am: a81a339c1d  -s ours

Change-Id: Ic593111485af94e822cf2644d7e5bf5348287f1a
 2017-08-22 23:31:10 +00:00
Amit Mahajan
f70f53473a Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052 
am: b2498bc422

Change-Id: I78ab5bbe68ada65f8691cda55fc6b1db0f708aac
 2017-08-22 21:19:52 +00:00
Amit Mahajan
b2498bc422 Merge "Change to not cache user entered apn type as user may change it." 
am: 54eeafa052

Change-Id: I33e32ee2d4a9e09f1fb6c383eb7e1d7e8a081c2c
 2017-08-22 21:09:12 +00:00
Treehugger Robot
54eeafa052 Merge "Change to not cache user entered apn type as user may change it." 2017-08-22 21:02:03 +00:00
TreeHugger Robot
a81a339c1d Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb 
am: b87acf6837

Change-Id: I477a4d7bc1002f01c610f232778067e3beb9c9cf
 2017-08-22 20:20:19 +00:00
TreeHugger Robot
b87acf6837 Merge changes from topic "Read dun APNs from apn db" 
am: f9390ce1fb

Change-Id: I1dd0a753bb08f7db6f36a7162b9f7f81a1c0406c
 2017-08-22 20:03:24 +00:00
Treehugger Robot
f9390ce1fb 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.
 2017-08-22 19:52:21 +00:00
Amit Mahajan
efe090ec60 Change to not cache user entered apn type as user may change it. 
Test: manual
Bug: 64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
 2017-08-22 19:36:45 +00:00
TreeHugger Robot
937e2d5a8e 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
 2017-08-22 18:20:32 +00:00
Amit Mahajan
2bfc9906c1 Check for null mReadOnlyApnTypes. 
Test: none
Bug: 62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
 2017-08-22 11:09:42 -07:00
Amit Mahajan
607e684f64 Disallow adding/editing dun APNs unless allowed by carrier. 
Test: WIP
Bug: 38186417
Change-Id: If1cc34ad979659a56a3886da2a02fdbf642739ac
 2017-08-22 11:09:42 -07:00
Bill Yi
95a797f5fc Import translations. DO NOT MERGE am: 4ced4787ce -s ours 
am: 5b9b88cc5b  -s ours

Change-Id: I40b762159141b73056cc04ceb18e084d49e53723
 2017-08-18 01:50:29 +00:00
Bill Yi
5b9b88cc5b Import translations. DO NOT MERGE 
am: 4ced4787ce  -s ours

Change-Id: Ie0c11be879fc1d31d8053de2b73f578143df7d7f
 2017-08-18 01:45:26 +00:00
Bill Yi
4ced4787ce Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64086495
Change-Id: I4e5c4860eae1b41fea7a34a88b53630d86745e8e
 2017-08-17 16:57:35 -07:00
Suprabh Shukla
7d1286299e 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
 2017-08-16 21:24:02 +00:00
Suprabh Shukla
1b3f6d0e47 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
 2017-08-16 21:23:05 +00:00
Suprabh Shukla
3691da8b51 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
 2017-08-16 21:22:17 +00:00
Suprabh Shukla
e237bdb4e2 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
 2017-08-16 20:51:19 +00:00
Suprabh Shukla
c180be3468 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
 2017-08-16 20:50:39 +00:00
Suprabh Shukla
8024f41ec1 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
 2017-08-16 20:48:07 +00:00
Suprabh Shukla
9a416573d7 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
 2017-08-16 20:42:38 +00:00
Suprabh Shukla
8fe20711fa 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
 2017-08-16 20:41:48 +00:00
Suprabh Shukla
bbe3047d1d 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
 2017-08-16 20:40:59 +00:00
Suprabh Shukla
d430178ba4 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
 2017-08-16 20:39:42 +00:00
Suprabh Shukla
c62f6f30bc 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
 2017-08-16 20:38:24 +00:00
Suprabh Shukla
5575d285db 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
 2017-08-16 20:37:36 +00:00
Suprabh Shukla
b4678ce1d2 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

Change-Id: I949bed4c34aeea91e85eae01ffbf812e486ac5d8
 2017-08-16 20:25:12 +00:00