Commit Graph

308596 Commits

Author SHA1 Message Date
Svetoslav Ganov
28a7194d25 Merge "Ensure default and system set bits grandfathered" 2017-02-23 21:03:44 +00:00
TreeHugger Robot
2930f49464 Merge "Revert "Remove abstract from AccessibilityService methods"" 2017-02-23 21:03:33 +00:00
Svet Ganov
137015599e Ensure default and system set bits grandfathered
We added the notion of a default and whether the system set
the setting. This is used for resetting the internal state and we need
to make sure this value is updated for the existing settings, otherwise
we would delete system set settings while they should stay unmodified.

Test: manual

bug:35317326

Change-Id: Iaffde2e7acab53653fd38e669a644e654cc7cd7d
2017-02-23 12:58:13 -08:00
Paul Lawrence
1d23472101 Merge "Use bionic's autogenerated whitelist policy" am: dcd14de5f6 am: 82c92f94bf
am: d82ce88b6c

Change-Id: Iba0e83f72931509331bd48fe85597c10ceec240e
2017-02-23 20:56:36 +00:00
TreeHugger Robot
212b51422d Merge "PlayerBase: reference to IAppOpsService may be null" 2017-02-23 20:54:06 +00:00
Amin Shaikh
08a1f24dd7 Merge changes from topic 'disabled-reason' am: d0fc3f1383 am: b858ffbe42
am: a071d9693b

Change-Id: I1ebe58cc4c7162931ad8679f87ade288489d4e8b
2017-02-23 20:47:46 +00:00
Paul Lawrence
d82ce88b6c Merge "Use bionic's autogenerated whitelist policy" am: dcd14de5f6
am: 82c92f94bf

Change-Id: I2995ab46372e10db9f879c359ead1ccbef9b45ae
2017-02-23 20:46:41 +00:00
Amin Shaikh
df0deba144 Add a disabled reason for recommendation providers am: a70bc57ef9 am: df6f7b9388
am: 004a682135

Change-Id: I02a7adb0d31bef2efdda0a4bcf7168d41674b559
2017-02-23 20:46:28 +00:00
TreeHugger Robot
52ab46519c Merge "Add metrics constant for Settings->Security->Encryption & credentials." 2017-02-23 20:41:44 +00:00
Paul Lawrence
82c92f94bf Merge "Use bionic's autogenerated whitelist policy"
am: dcd14de5f6

Change-Id: Idf1ab0f6a2028a1e41c52f6269ec05a9f1e87ec5
2017-02-23 20:41:33 +00:00
Amin Shaikh
a071d9693b Merge changes from topic 'disabled-reason' am: d0fc3f1383
am: b858ffbe42

Change-Id: I5138cd1713ccecac8fa304275aec88734c040ffb
2017-02-23 20:41:12 +00:00
Amin Shaikh
004a682135 Add a disabled reason for recommendation providers am: a70bc57ef9
am: df6f7b9388

Change-Id: Id69eccbba15a0eb20c48680204007ed5354bd734
2017-02-23 20:39:57 +00:00
Amin Shaikh
b858ffbe42 Merge changes from topic 'disabled-reason'
am: d0fc3f1383

Change-Id: I09e7dff673a56fb3c51cde827ae783da32407a70
2017-02-23 20:35:10 +00:00
Amin Shaikh
df6f7b9388 Add a disabled reason for recommendation providers
am: a70bc57ef9

Change-Id: Ie91764892f6bd8fc20990f5a172c020a670875ff
2017-02-23 20:33:59 +00:00
Jason Monk
eb527bccf8 Merge "Revert "Fix roaming getting stuck after changing sims"" 2017-02-23 20:33:04 +00:00
Jason Monk
99c405a35c Revert "Fix roaming getting stuck after changing sims"
This reverts commit 9d3dcdfe1c.

Change-Id: I21739f73548be383221b1bec81a05e196fe0a690
2017-02-23 20:32:24 +00:00
Treehugger Robot
dcd14de5f6 Merge "Use bionic's autogenerated whitelist policy" 2017-02-23 20:27:45 +00:00
Makoto Onuki
19ca2ad675 DO NOT MERGE Relax isUserRunning check and allow in-profile calls am: a08c6a1cfb am: 7c6b2f4d8b am: f171c39e53 am: 89bb32fb0d am: 3fe290622f
am: 9bda68ffb7  -s ours

Change-Id: I49a1e8fc8d12b2d8a69f26e2cf280e127119a4fe
2017-02-23 20:25:58 +00:00
TreeHugger Robot
b5a0ef8188 Merge "AAPT2: Few tweaks to get shared-libraries working" 2017-02-23 20:24:27 +00:00
TreeHugger Robot
7a30319091 Merge "Fix failing WifiConfigManagerTest test." 2017-02-23 20:22:40 +00:00
Treehugger Robot
d0fc3f1383 Merge changes from topic 'disabled-reason'
* changes:
  Fix failing WifiConfigManagerTest test.
  Add a disabled reason for recommendation providers
2017-02-23 20:22:07 +00:00
Brad Ebinger
46681288bc Merge "reates base implementation of ImsService AIDLs" am: b60869db12 am: fe8d588dad
am: fe2a74bfee

Change-Id: I9b7885ead16666b57e3b77b2bb868f81fb68de3b
2017-02-23 20:19:50 +00:00
Makoto Onuki
9bda68ffb7 DO NOT MERGE Relax isUserRunning check and allow in-profile calls am: a08c6a1cfb am: 7c6b2f4d8b am: f171c39e53 am: 89bb32fb0d
am: 3fe290622f

Change-Id: Ia96b9c9c7997c726da5ae0221bb4d2d41869deb2
2017-02-23 20:18:04 +00:00
Jason Monk
543947ba53 Merge "Update clipboard icon for the tuner" 2017-02-23 20:17:52 +00:00
Brad Ebinger
fe2a74bfee Merge "reates base implementation of ImsService AIDLs" am: b60869db12
am: fe8d588dad

Change-Id: I3425819c9ca83577ea4946dae072d9816626d5e5
2017-02-23 20:14:58 +00:00
Jason Monk
40d199fc48 Merge "Fix roaming getting stuck after changing sims" 2017-02-23 20:14:43 +00:00
Evan Laird
bb11b77523 Merge "Fix qs_signal icon clipping" 2017-02-23 20:14:16 +00:00
Jason Monk
222263dfc4 Merge "Fix data disabled icon from not showing in status bar" 2017-02-23 20:14:01 +00:00
Makoto Onuki
3fe290622f DO NOT MERGE Relax isUserRunning check and allow in-profile calls am: a08c6a1cfb am: 7c6b2f4d8b am: f171c39e53
am: 89bb32fb0d

Change-Id: I264cdae7f5db5e9b9ecb7ef93d60f977157e1512
2017-02-23 20:12:53 +00:00
Brad Ebinger
fe8d588dad Merge "reates base implementation of ImsService AIDLs"
am: b60869db12

Change-Id: I6edf280213bee0756aad65148daafe3300849baa
2017-02-23 20:10:34 +00:00
Makoto Onuki
89bb32fb0d DO NOT MERGE Relax isUserRunning check and allow in-profile calls am: a08c6a1cfb am: 7c6b2f4d8b
am: f171c39e53

Change-Id: I69a9ece7da697e2a2fb979febad1af352713ccbe
2017-02-23 20:07:27 +00:00
Makoto Onuki
f171c39e53 DO NOT MERGE Relax isUserRunning check and allow in-profile calls am: a08c6a1cfb
am: 7c6b2f4d8b

Change-Id: I18c2b795270260a02a117351fe5ca3ce5a5c0467
2017-02-23 20:03:59 +00:00
Treehugger Robot
b60869db12 Merge "reates base implementation of ImsService AIDLs" 2017-02-23 20:03:43 +00:00
TreeHugger Robot
125d2f14ee Merge "Update fill UI" 2017-02-23 20:01:06 +00:00
Evan Laird
8b72643b12 Fix qs_signal icon clipping
Test: visual
Change-Id: If212eefc9303590b7168432120c46bf07ac184d1
Fixes: 34799892
2017-02-23 15:00:46 -05:00
Makoto Onuki
7c6b2f4d8b DO NOT MERGE Relax isUserRunning check and allow in-profile calls
am: a08c6a1cfb

Change-Id: I07ce253853c1b3066c81af4f52a4ff6968437ef4
2017-02-23 20:00:01 +00:00
Jason Monk
0288de0e56 Fix data disabled icon from not showing in status bar
The NetworkController seemed to think the user wasn't set up since
the DeviceProvisionedController didn't send an initial callback
on add.

Also add some extra listening to data disabled state to avoid race
conditions there.

Change-Id: I17f759894a283da08eb0da7ceb5181355c8f4d55
Fixes: 35708363
Fixes: 35632846
Test: runtest systemui
2017-02-23 14:51:17 -05:00
Doris Ling
edb84c3a7c Add metrics constant for Settings->Security->Encryption & credentials.
Bug: 35630998
Test: build
Change-Id: I46f364a654440e6b0ba17477e6404e20449d3e0e
2017-02-23 11:07:36 -08:00
TreeHugger Robot
8716ef9419 Merge "Revert "Don't trigger auto-fill request if mode is manual"" 2017-02-23 18:58:26 +00:00
Phil Weaver
e231986368 Revert "Remove abstract from AccessibilityService methods"
This reverts commit 7c01afdd18.

Change-Id: I08990f4fc695b9323051e05a32c35fb9fe426146
2017-02-23 18:51:34 +00:00
TreeHugger Robot
7f7a7fa018 Merge "Fix an unintentional switch-case fall-through" 2017-02-23 18:42:53 +00:00
Daniel Nishi
7fc6aef099 Merge "Add metric for new storage screen." 2017-02-23 18:39:35 +00:00
TreeHugger Robot
4098172f46 Merge "Ensure we use the fullscreen stack bounds when expanding PiP." 2017-02-23 18:36:50 +00:00
Bryce Lee
576115819f Merge "Have VirtualDisplayDevice handle Binder death directly." 2017-02-23 18:35:35 +00:00
TreeHugger Robot
112a5b62d8 Merge "Temporarily whitelist apps known to hit the wtf case" 2017-02-23 18:33:18 +00:00
Jason Monk
9d3dcdfe1c Fix roaming getting stuck after changing sims
The header was keeping a map of roaming states which could have
stray old subids in it when it shouldn't. It just needs to be
cleared when the sims change.

Test: runtest systemui
Change-Id: I62c5acab5739b9c4acf69a8c7e00b2f75de903dc
2017-02-23 13:29:52 -05:00
Amin Shaikh
d6a62ed405 Fix failing WifiConfigManagerTest test.
Bug: 35671673
Test: runtest frameworks-core frameworks-wifi
Change-Id: I55ff41464cabfb97d03a0758d73145df808ec2c8
Merged-In: I55ff41464cabfb97d03a0758d73145df808ec2c8
2017-02-23 10:29:10 -08:00
Shreyas Basarge
ba9e399ffd Merge "Disallow parallel backups" 2017-02-23 18:27:25 +00:00
Shreyas Basarge
6a4b9a33dc Merge "Serialize restore operations" 2017-02-23 18:26:57 +00:00
Rob Carr
c864ca3039 Merge "Correct SurfaceControl matrix parameter names." 2017-02-23 18:26:29 +00:00