edgar.huang
8f42d1a4ab
Merge "Settings is crashed high probability when doing follow steps"
...
am: 2584202cb7
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
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
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
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
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
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
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
2017-08-22 20:20:19 +00:00
TreeHugger Robot
b87acf6837
Merge changes from topic "Read dun APNs from apn db"
...
am: f9390ce1fb
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
2017-08-18 01:50:29 +00:00
Bill Yi
5b9b88cc5b
Import translations. DO NOT MERGE
...
am: 4ced4787ce
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
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
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
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
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
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
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
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
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
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
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
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
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
2017-08-16 20:25:12 +00:00
Suprabh Shukla
28f6dd01bc
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
2017-08-16 20:24:28 +00:00
Suprabh Shukla
0e22588ed0
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
2017-08-16 20:23:41 +00:00
Suprabh Shukla
5d4a2bb844
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
2017-08-16 20:22:36 +00:00
Suprabh Shukla
a6b4e032c8
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
2017-08-16 20:18:15 +00:00
Suprabh Shukla
23e185adf8
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
2017-08-16 20:17:34 +00:00
Suprabh Shukla
142433924f
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
2017-08-16 20:17:28 +00:00
Suprabh Shukla
82afc6c5fd
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
2017-08-16 20:14:42 +00:00
Suprabh Shukla
81ba0cc873
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
2017-08-16 20:10:37 +00:00
Suprabh Shukla
df39274478
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
2017-08-16 20:09:35 +00:00
Suprabh Shukla
3dd026d5dc
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
2017-08-16 20:08:56 +00:00
Suprabh Shukla
202970aa92
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
2017-08-16 20:06:04 +00:00
Suprabh Shukla
05fec2162a
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
2017-08-16 20:04:24 +00:00
Suprabh Shukla
6d7bb4c4d0
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours
...
am: 817c35056c
2017-08-16 20:03:34 +00:00
