Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
298,385 Commits 3 Branches 0 Tags
cb42822758e95fcfbb791cb471dc96f780fb9bd1
Commit Graph

298385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cb42822758 Merge "API for requesting network recommendations." 2016-12-06 21:17:23 +00:00
Jeff Sharkey
d66edc45b6 Merge "Move dump() to dumpAsync(), more oneway calls." am: 5773d9702e -s ours am: 5b9b0db9f8 -s ours am: 6bc035949f -s ours 
am: 0c9bd0a4af  -s ours

Change-Id: I32616494ab72af40625f84e6ed5b37374599b38f
 2016-12-06 21:03:48 +00:00
TreeHugger Robot
7f0dc425a3 Merge "Adding a new string array resource for network recommendations." 2016-12-06 21:00:44 +00:00
Jeff Sharkey
0c9bd0a4af Merge "Move dump() to dumpAsync(), more oneway calls." am: 5773d9702e -s ours am: 5b9b0db9f8 -s ours 
am: 6bc035949f  -s ours

Change-Id: Ib90b83fee65c2ae095ff26ea5072d422494e6a15
 2016-12-06 20:57:26 +00:00
Pankaj Kanwar
17ba97ca52 Merge "DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified." into nyc-mr2-dev am: df4e14d400 
am: b565d55f48  -s ours

Change-Id: Ic98dce50b20ba976af43e2f5fb89e9893fade564
 2016-12-06 20:50:28 +00:00
pkanwar
d95dc2bf46 DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified. am: 34be302f2a 
am: b65452c18f  -s ours

Change-Id: I746579ce505ff39623b8b27915f83cee5dfb0894
 2016-12-06 20:49:32 +00:00
Jeff Sharkey
6bc035949f Merge "Move dump() to dumpAsync(), more oneway calls." am: 5773d9702e -s ours 
am: 5b9b0db9f8  -s ours

Change-Id: I085716f45435debc6418dd6bca9369cc2a17e1a4
 2016-12-06 20:49:23 +00:00
Jeff Sharkey
5b9b0db9f8 Merge "Move dump() to dumpAsync(), more oneway calls." 
am: 5773d9702e  -s ours

Change-Id: Ifc71dfc411dfd8d4fc23b8e7f0843ee90607bb3b
 2016-12-06 20:45:22 +00:00
Pankaj Kanwar
b565d55f48 Merge "DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified." into nyc-mr2-dev 
am: df4e14d400

Change-Id: I23e16392c59cd1e306ba334a6aaf1114f165c967
 2016-12-06 20:41:56 +00:00
pkanwar
b65452c18f DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified. 
am: 34be302f2a

Change-Id: I18f1ed3a4e8b6a923e5733fe38566d4484d1c310
 2016-12-06 20:41:50 +00:00
Pankaj Kanwar
df4e14d400 Merge "DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified." into nyc-mr2-dev 2016-12-06 20:35:52 +00:00
Yuanlang Song
7169dfd0b1 Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: e9d31e0b46" into nyc-mr2-dev-plus-aosp 
am: 05fa2d6a2e  -s ours

Change-Id: Id98a24298d1a5fc9e82f8d0a4026957535310249
 2016-12-06 20:31:47 +00:00
Yuanlang Song
4f179f7e12 Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: e9d31e0b46 
am: b824ff8c80  -s ours

Change-Id: I87184cee7b1c1b3cfe8840734b4c71dff6719352
 2016-12-06 20:31:42 +00:00
Yuanlang Song
5f6dc40aa9 Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: a49aa940be" into nyc-mr2-dev-plus-aosp 
am: f00afab1de  -s ours

Change-Id: I6de602f69d43e635f6925a9eeac78d06b8d03592
 2016-12-06 20:30:16 +00:00
Yuanlang Song
53204d2551 Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: a49aa940be 
am: c2bdd4418d  -s ours

Change-Id: Ied37728f9cb3d72d1e6b045f8648143652bf3ffa
 2016-12-06 20:30:12 +00:00
John Reck
fe37148dc2 Merge "DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 8360e7e38a" into nyc-mr2-dev-plus-aosp 
am: fdbb5175c5  -s ours

Change-Id: I432e5f3229af63826c1c2921ce29899bc80915ab
 2016-12-06 20:28:53 +00:00
John Reck
f99303ecef DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 8360e7e38a 
am: fd8c2cb0fd  -s ours

Change-Id: I33b96b00608a5e2450adc4bd5c29e114ddc1540a
 2016-12-06 20:28:48 +00:00
John Reck
153c0cdc38 DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 579e3667e3 
am: 24b0b5ca68  -s ours

Change-Id: I6a489a035d2242e42504941b82718611cf87e022
 2016-12-06 20:27:46 +00:00
Android Build Merger (Role)
05fa2d6a2e Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: e9d31e0b46" into nyc-mr2-dev-plus-aosp 2016-12-06 20:22:26 +00:00
Android Build Merger (Role)
f00afab1de Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: a49aa940be" into nyc-mr2-dev-plus-aosp 2016-12-06 20:22:19 +00:00
Yuanlang Song
b824ff8c80 Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 
am: e9d31e0b46

Change-Id: I7606364318202ad60b416438f500aaaff8eec0fb
 2016-12-06 20:21:47 +00:00
Yuanlang Song
c2bdd4418d Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 
am: a49aa940be

Change-Id: Ibf4d13e4fb4538ed9cfbae489a47057f3e78d644
 2016-12-06 20:21:31 +00:00
Android Build Merger (Role)
fdbb5175c5 Merge "DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 8360e7e38a" into nyc-mr2-dev-plus-aosp 2016-12-06 20:21:29 +00:00
John Reck
fd8c2cb0fd DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 
am: 8360e7e38a

Change-Id: I9f65c574fd434cce928381f64894642a92014712
 2016-12-06 20:20:48 +00:00
John Reck
24b0b5ca68 DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 
am: 579e3667e3

Change-Id: Ie27b93371a22360e6cdb9dffc2e78c14fa28333f
 2016-12-06 20:20:46 +00:00
Treehugger Robot
5773d9702e Merge "Move dump() to dumpAsync(), more oneway calls." 2016-12-06 20:15:28 +00:00
Yuanlang Song
a49aa940be Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev 
am: 647166e852

Change-Id: I33e59ffbe071470608141579d1742a414f308f76
 2016-12-06 20:13:54 +00:00
John Reck
579e3667e3 DO NOT MERGE: Add TouchLatency test 
am: 91e2e7f460

Change-Id: I1eeed0e4aea8dbe2d963b38cfe9d79449e1a17d2
 2016-12-06 20:13:49 +00:00
Yuanlang Song
e9d31e0b46 Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev 
am: 647166e852

Change-Id: I8985e69d3e04f0da6b923cf15db418338ac4edab
 2016-12-06 20:13:48 +00:00
John Reck
8360e7e38a DO NOT MERGE: Add TouchLatency test 
am: 91e2e7f460

Change-Id: I84a284f0316f68c24352178685eaa07f2b259411
 2016-12-06 20:13:45 +00:00
TreeHugger Robot
0c08a45028 Merge "Add READ_PHONE_NUMBER to the list of dangerous permissions." 2016-12-06 20:12:08 +00:00
Yuanlang Song
647166e852 Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev 2016-12-06 20:05:45 +00:00
Stephen Chen
79046ce039 Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db am: 45fdf32038 am: e70ef235fb 
am: 70889ff69f

Change-Id: If076123dc3874615b058bbddfd3c4810f54b303d
 2016-12-06 19:41:55 +00:00
Stephen Chen
70889ff69f Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db am: 45fdf32038 
am: e70ef235fb

Change-Id: I46186245e038597018f66e44459d724456e8f993
 2016-12-06 19:34:46 +00:00
TreeHugger Robot
877ab7f9fd Merge "Revert "Revert "WindowList be gone!""" 2016-12-06 19:27:53 +00:00
Stephen Chen
e70ef235fb Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db 
am: 45fdf32038

Change-Id: I141248962fc0ce710b6860f3f67ca156ecdab46e
 2016-12-06 19:27:45 +00:00
Fyodor Kupolov
0ef99417bd Merge "Init PersistentDatablockService on the worker thread" 2016-12-06 19:22:15 +00:00
Stephen Chen
45fdf32038 Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." 
am: 70ae1bf4db

Change-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022
 2016-12-06 19:20:24 +00:00
Treehugger Robot
70ae1bf4db Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." 2016-12-06 19:11:28 +00:00
Jeff Sharkey
b2c312a742 Move dump() to dumpAsync(), more oneway calls. 
When calling out to dump services hosted by external apps, use
dumpAsync() to avoid hanging if the remote process is wedged.

Test: builds, boots, runs with minimal logs triggered
Bug: 32715088
Change-Id: I70aa2666ae21dae8f09ded2063bed359c0b210c5
Merged-In: I70aa2666ae21dae8f09ded2063bed359c0b210c5
 2016-12-06 19:08:34 +00:00
pkanwar
34be302f2a DO NOT MERGE: Add notification delay for when the user needs cannot register to a 
network and needs to be notified.

BUG: 28572539
Change-Id: Iabf5e4476a1c5b02d1de38695f7125ee888dadd9
 2016-12-06 10:52:59 -08:00
Damien Bargiacchi
a8e0ed79f9 Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 43b08e2fb3" into nyc-mr2-dev-plus-aosp 
am: 416427e820

Change-Id: I790669ff7d7345360959528f17cf5b44a2d302c7
 2016-12-06 18:52:23 +00:00
Damien Bargiacchi
ab1da9314e Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 43b08e2fb3 
am: 81de5ef429

Change-Id: I90e188b2b4a702df9c8f5e5873f75b3cfd20cc18
 2016-12-06 18:52:14 +00:00
Damien Bargiacchi
391bf2530f Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 4ce3dee6e6" into nyc-mr2-dev-plus-aosp 
am: f72b595f68

Change-Id: I0a31e2a107a0d88944ec8487212da33ec4805f34
 2016-12-06 18:50:39 +00:00
Damien Bargiacchi
9c67c5007b Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 4ce3dee6e6 
am: 72ae53f0d3

Change-Id: I7a336c5b6bd44307b812105cd18e0555e02408a8
 2016-12-06 18:50:30 +00:00
Damien Bargiacchi
9f7dcf6efa Merge "Centre clock text on visible characters instead of : character am: 45a7644004 am: 76a3de316c" into nyc-mr2-dev-plus-aosp 
am: 45a6dfa88a

Change-Id: I115649ab4bc8aafdc6d68c089b3eed619f16f97f
 2016-12-06 18:49:00 +00:00
Damien Bargiacchi
2dc93aab56 Centre clock text on visible characters instead of : character am: 45a7644004 am: 76a3de316c 
am: 7237200947

Change-Id: I2ff3590bdecc0331dc05f31eaac4bf7f226df8a8
 2016-12-06 18:48:51 +00:00
Damien Bargiacchi
53dd8b80a5 Centre clock text on visible characters instead of : character am: 45a7644004 am: 04f17be3e6 
am: e2ca6b465e

Change-Id: If3edabead7835e9949f1d1601cbe7cb59c0bbc4c
 2016-12-06 18:47:46 +00:00
Android Build Merger (Role)
416427e820 Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 43b08e2fb3" into nyc-mr2-dev-plus-aosp 2016-12-06 18:42:28 +00:00
Android Build Merger (Role)
f72b595f68 Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 4ce3dee6e6" into nyc-mr2-dev-plus-aosp 2016-12-06 18:42:16 +00:00