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

304064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
a71dec4da2 Import translations. DO NOT MERGE 
Change-Id: I517c7a58e036fe474446472eb798747656fe24b2
Auto-generated-cl: translation import
 2017-01-21 11:37:22 -08:00
TreeHugger Robot
9a33bda070 Merge "Add @TestApi PopupMenu.getMenuListView" 2017-01-21 07:10:05 +00:00
Christine Franks
05aa9e6f29 Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev am: e1a7e67dc0 
am: 0405386934  -s ours

Change-Id: I1fd1fd38e3a2d7b7491cf279d36183ba67839753
 2017-01-21 05:47:58 +00:00
Christine Franks
c4fb3e3e76 DO NOT MERGE - Require password to FR in carrier demo mode am: 319b44e6e9 
am: b196493856  -s ours

Change-Id: I9813d735626a1d92b5eeebc1b7b6bab445e69ada
 2017-01-21 05:46:57 +00:00
Amin Shaikh
20dec7b14f Merge "Add Setting for curating saved open networks." am: b3b665de22 am: 2aec2f7a9c am: 835db7f6b6 
am: 17a040d48e  -s ours

Change-Id: Ic54b5dccaec681ad30c8370aab9cc704ed38622b
 2017-01-21 05:45:56 +00:00
Christine Franks
0405386934 Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev 
am: e1a7e67dc0

Change-Id: I3a337da003d504647d6ff7489d907754986e8482
 2017-01-21 05:42:11 +00:00
Christine Franks
b196493856 DO NOT MERGE - Require password to FR in carrier demo mode 
am: 319b44e6e9

Change-Id: Ie53a29cfc067f255f2f90e5d83ec8d92a57a3651
 2017-01-21 05:42:06 +00:00
Amin Shaikh
17a040d48e Merge "Add Setting for curating saved open networks." am: b3b665de22 am: 2aec2f7a9c 
am: 835db7f6b6

Change-Id: I5a8e3a4fc0198dbb7bf88e2bbcf0152b0b82a7fc
 2017-01-21 05:38:45 +00:00
Christine Franks
e1a7e67dc0 Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev 2017-01-21 05:36:12 +00:00
Amin Shaikh
835db7f6b6 Merge "Add Setting for curating saved open networks." am: b3b665de22 
am: 2aec2f7a9c

Change-Id: If61be9f8e71bb89a8714c3f4a5eb10b04982cdf7
 2017-01-21 05:34:12 +00:00
Amin Shaikh
2aec2f7a9c Merge "Add Setting for curating saved open networks." 
am: b3b665de22

Change-Id: I3c65f39dc4f38f1c6c00a240f519cb0b0cf1a916
 2017-01-21 05:27:06 +00:00
Erik Kline
e779fd6afa Merge "Move several config elements into TetheringConfiguration class" am: 8d35276910 am: 81499754bc am: 46f036c6da 
am: 9bd62dee06

Change-Id: If0212af9c8fa35b190640ed2bf4bd7332078625d
 2017-01-21 05:19:09 +00:00
Erik Kline
4d77e8bab9 Move several config elements into TetheringConfiguration class am: 3e7566572e am: ec45953fd7 am: befb6a1702 
am: dac4c3702f

Change-Id: Ib19c970ca13ad5c08c581506f8f53c3a3c47e3ba
 2017-01-21 05:18:07 +00:00
Treehugger Robot
b3b665de22 Merge "Add Setting for curating saved open networks." 2017-01-21 05:17:41 +00:00
Jesse Hall
2686208982 Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev am: f2a54b6a39 -s ours 
am: 4d2afaa85a  -s ours

Change-Id: Ib6613b13fcae139f0a5aa611de239d5f5d5b4f15
 2017-01-21 05:17:01 +00:00
Jesse Hall
50439d4da5 Load EGL early in Activity launch, instead of in Zygote am: fd104e7fde -s ours 
am: e1d004740a  -s ours

Change-Id: Iec83488d82e6bdfba2fd9b73c315d7d36de22e7a
 2017-01-21 05:15:55 +00:00
Erik Kline
9bd62dee06 Merge "Move several config elements into TetheringConfiguration class" am: 8d35276910 am: 81499754bc 
am: 46f036c6da

Change-Id: I29fb42f75f0bd660f003794b47164d119a3e57ae
 2017-01-21 05:12:58 +00:00
Erik Kline
dac4c3702f Move several config elements into TetheringConfiguration class am: 3e7566572e am: ec45953fd7 
am: befb6a1702

Change-Id: Ife89a2da79aa2a3002eca50f7e9c0a91c894375c
 2017-01-21 05:12:00 +00:00
Jesse Hall
4d2afaa85a Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev 
am: f2a54b6a39  -s ours

Change-Id: I3392b81976e9a530faba27ff93e6514ad8ded7a7
 2017-01-21 05:08:38 +00:00
Jesse Hall
e1d004740a Load EGL early in Activity launch, instead of in Zygote 
am: fd104e7fde  -s ours

Change-Id: Ide0fccd9666589c0003312ee51e25eb253bddce7
 2017-01-21 05:08:33 +00:00
Erik Kline
46f036c6da Merge "Move several config elements into TetheringConfiguration class" am: 8d35276910 
am: 81499754bc

Change-Id: I6a0dc7192aeca1ecccbf8223516bf3f5f4a9bfb8
 2017-01-21 05:06:06 +00:00
Erik Kline
8512304390 Merge "Address a few unittest comments." am: 9c3a298748 am: d4d464ae2c am: 8de6457414 
am: d870ed9e26

Change-Id: Ifd4c7e8ec13d24e5c58f727c9a2e3f1521643e4c
 2017-01-21 05:05:22 +00:00
Erik Kline
befb6a1702 Move several config elements into TetheringConfiguration class am: 3e7566572e 
am: ec45953fd7

Change-Id: If9cffb4d63cdfdf075b6c8991e763f4237d0d5a8
 2017-01-21 05:05:04 +00:00
TreeHugger Robot
f2a54b6a39 Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev 2017-01-21 05:04:24 +00:00
Erik Kline
81499754bc Merge "Move several config elements into TetheringConfiguration class" 
am: 8d35276910

Change-Id: I0eb196a4b61e460db24271d6805177641ad3fc9b
 2017-01-21 04:57:34 +00:00
Erik Kline
d870ed9e26 Merge "Address a few unittest comments." am: 9c3a298748 am: d4d464ae2c 
am: 8de6457414

Change-Id: I007c10df7bd3658453cb245d11f5b606ac70e0b3
 2017-01-21 04:57:32 +00:00
Erik Kline
ec45953fd7 Move several config elements into TetheringConfiguration class 
am: 3e7566572e

Change-Id: Ic053965b54eed0afc9a4785ce80ef1fab281493a
 2017-01-21 04:57:29 +00:00
Erik Kline
8de6457414 Merge "Address a few unittest comments." am: 9c3a298748 
am: d4d464ae2c

Change-Id: Iacb543c081a89327c66ce849b764866f12bc60d0
 2017-01-21 04:50:36 +00:00
Erik Kline
8d35276910 Merge "Move several config elements into TetheringConfiguration class" 2017-01-21 04:49:11 +00:00
Erik Kline
d4d464ae2c Merge "Address a few unittest comments." 
am: 9c3a298748

Change-Id: I2d41cdbe05653bcbed9d3b38b440c06b98006809
 2017-01-21 04:43:27 +00:00
Chad Brubaker
9d8e0fc679 Merge "Rename visibleToEphemeral to visibleToInstantApps" 2017-01-21 04:38:55 +00:00
Erik Kline
9c3a298748 Merge "Address a few unittest comments." 2017-01-21 04:36:28 +00:00
Sanket Agarwal
705eedcb01 Merge "Change HFP Client API to support multi device" 2017-01-21 03:21:58 +00:00
Chris Phoenix
bc21539a76 Merge "vibrator HAL uses "default" service name" 2017-01-21 02:51:35 +00:00
Jesse Hall
9a5f9d3663 Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev-plus-aosp 
am: 0d3537c67b

Change-Id: Iba27f6ba7c4830688e1d96a02fc864a13e221189
 2017-01-21 02:44:11 +00:00
TreeHugger Robot
af6668bc9d Merge "resolve merge conflicts of 5fa7fb1d9f2a to master" 2017-01-21 02:41:19 +00:00
Chris Phoenix
c310a90495 vibrator HAL uses "default" service name 
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds; verify HAL still works

Bug: 33844934

Change-Id: I7ad730bc5b52b9bd3c63410f6f926cbc08d0b73c
 2017-01-21 02:34:16 +00:00
Amin Shaikh
8533622ae7 Add Setting for curating saved open networks. 
Bug: 34392914
Test: make
Change-Id: Icd17753af6b0efdb35d1060b16029a53fdf4e605
Merged-In: Icd17753af6b0efdb35d1060b16029a53fdf4e605
 2017-01-20 18:31:56 -08:00
TreeHugger Robot
885019151d Merge "Add Setting for curating saved open networks." 2017-01-21 02:27:30 +00:00
Christine Franks
319b44e6e9 DO NOT MERGE - Require password to FR in carrier demo mode 
Bug: 34341567
Test: manual - password not required for regular user factory resets
and is required in carrier demo mode.

Change-Id: If696e5c5c806e31399e33a151b0d36e7a950ceb0
 2017-01-21 02:25:39 +00:00
TreeHugger Robot
5feefa54c4 Merge "Introduce RescueParty." 2017-01-21 02:22:43 +00:00
Zac Iqbal
655f908aa6 Merge "Added an onDeviceUnlockLockout callback to TrustAgentService." 2017-01-21 01:35:43 +00:00
TreeHugger Robot
0b0a6b63be Merge "Import translations. DO NOT MERGE" 2017-01-21 01:17:41 +00:00
TreeHugger Robot
c49f2e5d88 Merge "Add ClipData.addItem(Item, ContentResolver)" 2017-01-21 01:09:28 +00:00
Jesse Hall
3bb7e5c909 resolve merge conflicts of 5fa7fb1d9f2a to master 
Test: make
Change-Id: I7f119535a120303796fcd08f0274269f7d0dbaba
 2017-01-20 17:04:48 -08:00
TreeHugger Robot
4cbec883f1 Merge "Set permissions for launching on private displays" 2017-01-21 00:59:20 +00:00
Jeff Sharkey
fe6f85cac9 Introduce RescueParty. 
When a device gets stuck in a crash loop, it's pretty much unusable
and impossible for users to recover from.

To help rescue devices from this state, this change introduces a new
feature that watches for runtime restart loops and persistent app
crash loops, and escalates through a series of increasingly
aggressive rescue operations.  Currently these rescue levels walk
through clearing any experiments in SettingsProvider before finally
rebooting and prompting the user to wipe data.

Crash loops are detected based on a number of events in a specific
window of time.  App stats can be stored in memory, but boot stats
need to be stored in system properties to be more robust.

Start up RecoveryService much earlier during the boot so we can
reboot into recovery when needed.

Add properties tha push system_server or SystemUI into a crash loops
for testing purposes.

Test: builds, boots, forced crashing walks through modes
Bug: 24872457, 30951331
Change-Id: I6cdd37682973fe18de0f08521e88f70ee7d7728b
 2017-01-20 17:36:38 -07:00
TreeHugger Robot
3b8eaf3f3c Merge "Remove style TextAppearance.StatusBar.TextButton" 2017-01-21 00:31:18 +00:00
TreeHugger Robot
961405613c Merge "Updating picture-in-picture API." 2017-01-21 00:29:23 +00:00
David Ouyang
618fb8b194 Merge "Promote DevicePolicyManager.packageHasActiveAdmins for Play Store" 2017-01-21 00:28:17 +00:00