drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
308,614 Commits 1 Branch 0 Tags
Commit Graph

308614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abhishek Adappa
423b3bd84f Merge "Add a new ImsReasonInfo code" am: b4234e6af8 am: bb59947d90 
am: 44f4430953

Change-Id: Iaaa2f91f36f0f57a81a5f0e7781564296654a33a
 2017-02-23 22:32:50 +00:00
Abhishek Adappa
44f4430953 Merge "Add a new ImsReasonInfo code" am: b4234e6af8 
am: bb59947d90

Change-Id: I06bd38225b0fcbd8619a5b5eb7d827cfba1c0cb0
 2017-02-23 22:27:07 +00:00
Abhishek Adappa
bb59947d90 Merge "Add a new ImsReasonInfo code" 
am: b4234e6af8

Change-Id: Ia5174fafbc08acf559e35a28538d2b112b5cdb19
 2017-02-23 22:22:40 +00:00
Treehugger Robot
b4234e6af8 Merge "Add a new ImsReasonInfo code" 2017-02-23 22:14:21 +00:00
Rebecca Silberstein
e71d9469a3 Merge "wifi.proto: add SoftApReturnCode enum" am: 84374678e0 am: e1dd7de75e 
am: ded006f4cf

Change-Id: I8c41e4aff5734db561d2e63a7df344e292179832
 2017-02-23 21:57:09 +00:00
Rebecca Silberstein
ded006f4cf Merge "wifi.proto: add SoftApReturnCode enum" am: 84374678e0 
am: e1dd7de75e

Change-Id: I9d3b69543b45dbf797d5fee0f8de51966ca4dacb
 2017-02-23 21:52:34 +00:00
Rebecca Silberstein
e1dd7de75e Merge "wifi.proto: add SoftApReturnCode enum" 
am: 84374678e0

Change-Id: I22d8aca86a5a5c28c393db372b4399e5ddd99f46
 2017-02-23 21:46:51 +00:00
Rebecca Silberstein
84374678e0 Merge "wifi.proto: add SoftApReturnCode enum" 2017-02-23 21:29:02 +00:00
TreeHugger Robot
5feacbed43 Merge "Load splits on-demand" 2017-02-23 21:25:08 +00:00
TreeHugger Robot
d7ece194c7 Merge "Fix unit test that failed due to incorrect refactor." 2017-02-23 21:24:39 +00:00
TreeHugger Robot
ff14143cee Merge "Take another pass at detecting USB connections." 2017-02-23 21:11:54 +00:00
TreeHugger Robot
23830a0909 Merge "Remove ContentProvider queries in updateTileData." 2017-02-23 21:11:18 +00:00
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 9d3dcdfe1c15ffa1c8d3694a4f2bf5e2280aa5ba.

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
Jeff Sharkey
1bec44836e Take another pass at detecting USB connections. 
For some odd reason, devices with ADB connections in test harnesses
are reporting that they're connected over an AC charger instead of
USB charger.

So switch to reading a sysfs file to detect an active USB connection.

Test: builds, boots, rescue disabled when USB connection present
Bug: 34872406
Change-Id: I4c2cb9ed7e51b9692ce81eb0ef4945dae0036212
 2017-02-23 12:40:57 -07:00