Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
280,435 Commits 3 Branches 0 Tags
b0d5ade11cae4eda6e58d2928afcdccd08e4e86b
Commit Graph

280435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allen Hair
b0d5ade11c Enable multi-dex for coverage builds to fix breakage 
am: 77a51d1274

Change-Id: Ife18d443d4c6a7ffcdb183cee3f7317efafbab38
 2016-12-21 18:44:08 +00:00
Jiaquan He
5887b6d7b5 Merge "DO NOT MERGE - Disabled swiping in Grid-based Recents." into nyc-mr2-dev 
am: b9606a5d09

Change-Id: I3888fc06f40661f73689a71b3db83a52ccbb7c89
 2016-12-21 18:18:39 +00:00
Jiaquan He
3785f0a2f6 DO NOT MERGE - Disabled swiping in Grid-based Recents. 
am: 620aebabb2

Change-Id: I24914bfe923ec251adff8c931c32398c013ac581
 2016-12-21 18:18:34 +00:00
TreeHugger Robot
b9606a5d09 Merge "DO NOT MERGE - Disabled swiping in Grid-based Recents." into nyc-mr2-dev 2016-12-21 18:09:48 +00:00
Allen Hair
77a51d1274 Enable multi-dex for coverage builds to fix breakage 
Test: m PRODUCT-bullhead-userdebug showcommands dist EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I6a324cbd0dc078ad2903345a069385d9f0d179ff
(cherry picked from commit aeaee4c5fe)
 2016-12-21 17:22:33 +00:00
Calin Juravle
5be781d874 Merge "Report non-primary dex files loads to PM" am: f23ea2ca62 am: 78b3889804 
am: 9947e79b26

Change-Id: I8ddb7756c0690584343cb026a298bc5f0b8d4e27
 2016-12-21 10:14:42 +00:00
Calin Juravle
9947e79b26 Merge "Report non-primary dex files loads to PM" am: f23ea2ca62 
am: 78b3889804

Change-Id: Iaf17def2729170403fa61ce0e09ced4675a47191
 2016-12-21 10:09:45 +00:00
Calin Juravle
78b3889804 Merge "Report non-primary dex files loads to PM" 
am: f23ea2ca62

Change-Id: I5eb9f8c8bc7e66c074adb95ad5dfec412cec539c
 2016-12-21 10:04:39 +00:00
Calin Juravle
f23ea2ca62 Merge "Report non-primary dex files loads to PM" 2016-12-21 09:57:41 +00:00
Manu Cornet
ceebe36a17 Merge "DO NOT MERGE - Delete the separate grid recents activity and related code" into nyc-mr2-dev 
am: 09c0fdca7b

Change-Id: Iee06fca34f0b8fed136be45a93359414a5420734
 2016-12-21 03:43:56 +00:00
Manu Cornet
15b6c78534 DO NOT MERGE - Delete the separate grid recents activity and related code 
am: e93f8100a6

Change-Id: I30195b094fe27bec5b78f799942bf004000d9ef2
 2016-12-21 03:43:49 +00:00
TreeHugger Robot
09c0fdca7b Merge "DO NOT MERGE - Delete the separate grid recents activity and related code" into nyc-mr2-dev 2016-12-21 03:35:45 +00:00
Daniel Nishi
6ee226f6e6 Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev 
am: 639f95dd13

Change-Id: I3491a1ef5303e8e991eafe3911c882d94d4d3ed5
 2016-12-21 02:28:55 +00:00
Daniel Nishi
f1312cd68e Augment diskstats dumpsys to have categorization and apps. 
am: 090b2d9d6c

Change-Id: I2c923293a1baf91b14ab50e25c880bfeb191403d
 2016-12-21 02:23:50 +00:00
Daniel Nishi
a9d8602787 Add a file collector to the platform. 
am: be770dce08

Change-Id: I2b908b6df1ad305207fca596d6c865dfeaecd5c9
 2016-12-21 02:23:05 +00:00
Daniel Nishi
9bd20ab6c9 Merge "Add an app size collector." into nyc-mr2-dev 
am: 8fd55702b1

Change-Id: I53fd6c70e49fd724fbe131dea3f485893133bf20
 2016-12-21 02:22:18 +00:00
Daniel Nishi
f5e2f1ae38 Add an app size collector. 
am: c7d9de59bf

Change-Id: I83bdc3b47eda2658d7467b7c298652e39ad3f238
 2016-12-21 02:21:31 +00:00
TreeHugger Robot
639f95dd13 Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev 
* changes:
  Augment diskstats dumpsys to have categorization and apps.
  Add a file collector to the platform.
 2016-12-21 02:14:54 +00:00
TreeHugger Robot
8fd55702b1 Merge "Add an app size collector." into nyc-mr2-dev 2016-12-21 02:14:54 +00:00
Tim Murray
5ff379db34 Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a am: a72f5f27d2 
am: 4dfe21d668

Change-Id: I3840f68322659336d6737747dd86abcca48fa639
 2016-12-21 02:10:23 +00:00
Tim Murray
4dfe21d668 Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a 
am: a72f5f27d2

Change-Id: I172251111ab333e750bc862725a50b7913f20c90
 2016-12-21 02:05:58 +00:00
Jiaquan He
620aebabb2 DO NOT MERGE - Disabled swiping in Grid-based Recents. 
Bug: 32101881
Change-Id: I45a806a6b1fc387b2c560a8f2228ad83e4068d7c
(cherry picked from commit 7e09146f13)
 2016-12-21 02:02:44 +00:00
Tim Murray
a72f5f27d2 Merge "Fix incorrect FIFO cgroup assignment." 
am: d9ce420d9a

Change-Id: Ib5c5ee81058ded098d16dba1dfd43096bbd91937
 2016-12-21 01:57:51 +00:00
Manu Cornet
e93f8100a6 DO NOT MERGE - Delete the separate grid recents activity and related code 
This was the first attempt at implementing grid-based Recents.
The new implementation doesn't use a separate activity and reuses a lot
more code.

Bug: 32101881
Test: Checked Recents behavior on local sw600dp device
Change-Id: Ic3535fc49f3f5448d6002d354678b633f122f57d
 2016-12-20 17:52:45 -08:00
Treehugger Robot
d9ce420d9a Merge "Fix incorrect FIFO cgroup assignment." 2016-12-21 01:47:56 +00:00
Brad Ebinger
6c7f5eb29e Merge "Adds custom call forwarding block while roaming carrier config key" into nyc-mr2-dev 
am: 5153e46897

Change-Id: I1476d383602745c0e11de916c85618e2640eb24e
 2016-12-21 01:34:25 +00:00
Brad Ebinger
f979b94815 Adds custom call forwarding block while roaming carrier config key 
am: eab25ae197

Change-Id: Ic638971c4bae7b496e94431ae2c0f35a22261896
 2016-12-21 01:34:11 +00:00
Brad Ebinger
5153e46897 Merge "Adds custom call forwarding block while roaming carrier config key" into nyc-mr2-dev 2016-12-21 01:29:13 +00:00
Amin Shaikh
ddf90dacd4 Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 am: 380341f6c8 
am: 18d7a5e95f

Change-Id: I9e0240a30524436d13c60c3a1251064012c6f7bb
 2016-12-21 01:19:48 +00:00
Amin Shaikh
18d7a5e95f Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 
am: 380341f6c8

Change-Id: If863fcce014adf2b2c0d866dc14ba59732f57520
 2016-12-21 01:15:18 +00:00
Amin Shaikh
380341f6c8 Merge "Change fillColor for Wi-Fi badges to #FFFFFF." 
am: c1940ef392

Change-Id: If3d909680cbcda0440807db40761c1a84b2cde97
 2016-12-21 01:10:44 +00:00
Treehugger Robot
c1940ef392 Merge "Change fillColor for Wi-Fi badges to #FFFFFF." 2016-12-21 01:00:19 +00:00
Sundeep Ghuman
2d68d1a13c Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab am: 6d749fb489 
am: c5443c1d5c

Change-Id: Icbe6a2c873cdbe795092589430b15f10545a3cc2
 2016-12-21 00:56:48 +00:00
Sundeep Ghuman
c5443c1d5c Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab 
am: 6d749fb489

Change-Id: I711dd2b9d142a3a92ed641b08dd944be329e503a
 2016-12-21 00:51:49 +00:00
Sundeep Ghuman
6d749fb489 Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." 
am: 31a8f712ab

Change-Id: Iba52c9ed85a7e35c46b85a9516a81ac5096a6710
 2016-12-21 00:43:15 +00:00
Treehugger Robot
31a8f712ab Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." 2016-12-21 00:28:48 +00:00
Marie Janssen
eac9538c5c Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev 
am: f77ca5fa18

Change-Id: Iee9a1e57f9b6ad0262fa5cedf1fc0daaf9c2fc00
 2016-12-20 23:38:31 +00:00
Marie Janssen
e7f0fd1d36 Bluetooth: persist state when turning on from BLE 
am: fa9bec95a5

Change-Id: I7fa40c657100032e400af8422b29941771b0e91a
 2016-12-20 23:38:26 +00:00
TreeHugger Robot
f77ca5fa18 Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev 2016-12-20 23:29:38 +00:00
Amin Shaikh
70b1c6ab40 Change fillColor for Wi-Fi badges to #FFFFFF. 
Bug: 33778046
Test: make
Change-Id: I0cfc2c6d682a2f13e665563fc1c54fa19324af53
 2016-12-20 15:28:34 -08:00
Sundeep Ghuman
d76e65bead Create and implement a CacheListener inside WifiNetworkScoreCache. 
Bug: 33041117
Test: Unit tests
Change-Id: Ic07522062f79223079b84c49210fcfc0217ecd38
 2016-12-20 15:07:01 -08:00
Andrew Sapperstein
8392637afd Merge "Add flags to send package name for feedback." into nyc-mr2-dev 
am: 72df83d117

Change-Id: I8a4bba81f402372035eaf37bd5d6489f042b52b9
 2016-12-20 23:03:54 +00:00
Andrew Sapperstein
4e10b37b71 Add flags to send package name for feedback. 
am: 8dc3b870a0

Change-Id: I72a213a36de7459850e3f688569c901c192dcf9a
 2016-12-20 23:03:26 +00:00
TreeHugger Robot
72df83d117 Merge "Add flags to send package name for feedback." into nyc-mr2-dev 2016-12-20 22:57:19 +00:00
Amin Shaikh
6a7dbcb63c Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5 
am: 9209505c85

Change-Id: I4584fa5909f60fa21dec2014c90b3d7dc49a13a9
 2016-12-20 22:48:15 +00:00
Amin Shaikh
9209505c85 Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd 
am: a81a4163f5

Change-Id: I847b3d07024e025040304f47de88211956d20175
 2016-12-20 22:39:41 +00:00
Amin Shaikh
a81a4163f5 Merge "Make WifiConfiguration#meteredHint a @SystemApi" 
am: f456ddf3fd

Change-Id: Ie1324197329486e9eeec0bb765441a6fc5bb8a32
 2016-12-20 22:35:06 +00:00
Brad Ebinger
eab25ae197 Adds custom call forwarding block while roaming carrier config key 
Adds support for supplying custom call forwarding prefixes in the carrier
config. When a prefix supplied in the carrier config is matched to the number
being dialed, we do not complete the call and instead show an error message
on the dialer UI.

Test: Manual
Bug: 30458052
Merged-In: I3149a565b0fd631d69ab0c0f27be509237b80177
Change-Id: I3149a565b0fd631d69ab0c0f27be509237b80177
 2016-12-20 14:34:52 -08:00
Treehugger Robot
f456ddf3fd Merge "Make WifiConfiguration#meteredHint a @SystemApi" 2016-12-20 22:24:13 +00:00
Tim Murray
a6b0ad5821 Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev 
am: a03c3e74a4

Change-Id: I3f5633da996140cf88d85e5f997d9e41d48dec45
 2016-12-20 22:17:35 +00:00