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

293519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
cacb28f2d6 Use Google3 style guide with .clang-format 
Test: style change only, builds ok
Change-Id: I885180e24cb2e7b58cfb4967c3bcb40058ce4078
 2016-10-19 12:18:14 -07:00
Marie Janssen
733f0bc08e Bluetooth: More logging of bluetooth service state am: 9fa2491850 am: d8e027b5a4 
am: 849174f228

Change-Id: I3049a597bf3182b68167973ab897749833a0dc9d
 2016-10-19 16:56:49 +00:00
Marie Janssen
849174f228 Bluetooth: More logging of bluetooth service state am: 9fa2491850 
am: d8e027b5a4

Change-Id: Ifaa9bad48234a6035b49a6a05484d91df31c5727
 2016-10-19 16:49:23 +00:00
Marie Janssen
d8e027b5a4 Bluetooth: More logging of bluetooth service state 
am: 9fa2491850

Change-Id: Idd26922caf3c1a0fb77d2091ac86bfe3a1d1c62a
 2016-10-19 16:43:09 +00:00
TreeHugger Robot
4b6e0d7b6e Merge "Have DisplayContent be the call point for assigning window layers" 2016-10-19 16:30:55 +00:00
Marie Janssen
9fa2491850 Bluetooth: More logging of bluetooth service state 
Bug: 32140251
Bug: 32140271
Bug: 32060415

Change-Id: I50faa184551748023ea5a573646a75293f553d16
 2016-10-19 16:28:31 +00:00
Jason Monk
b4d876a5d6 Merge "Hide QS customizer correctly" am: 03e4eb32fe am: fb56958223 
am: 9dce7cdf13

Change-Id: I884b10c5a187bfd4299b9ff5b6ed1aa6917c3e71
 2016-10-19 15:31:44 +00:00
Jason Monk
9dce7cdf13 Merge "Hide QS customizer correctly" am: 03e4eb32fe 
am: fb56958223

Change-Id: I62095e8b8c5bea7627e59cf166abce1cfa4ce2f1
 2016-10-19 15:23:40 +00:00
Jason Monk
fb56958223 Merge "Hide QS customizer correctly" 
am: 03e4eb32fe

Change-Id: I8c1998de76beee26b703781a6f883e9efd24bde3
 2016-10-19 15:15:43 +00:00
Jason Monk
03e4eb32fe Merge "Hide QS customizer correctly" 2016-10-19 15:05:41 +00:00
Wale Ogunwale
c69694abbd Have DisplayContent be the call point for assigning window layers 
First step in trying to make the WindowList private to DisplayContent
Have the rest of the system call DisplayContent when they need to
assign layers to windows instead of calling WindowLayersController
directly. That way all the various call points don't need to get
the WindowList from DisplayContent to pass on to WindowLayersController.

Test: Existing tests pass.
Change-Id: If869abf7ba1c33b575908006ae5ad1557abc361c
 2016-10-19 07:22:23 -07:00
Hugo Benichi
c4ee093bf6 Merge "Add IP conn metrics to dumpsys and bug reports" 2016-10-19 07:13:39 +00:00
Hugo Benichi
51d14cb607 Add IP conn metrics to dumpsys and bug reports 
Test: manually created a bug report and inspected content.
Change-Id: I3119db2a25c895264eae409f1dda9fc756cd244e
 2016-10-19 13:48:40 +09:00
TreeHugger Robot
480db8cff8 Merge "fix wrong trace from IpConnectivityMetrics" 2016-10-19 04:32:09 +00:00
Salvador Martinez
e177b5b7bb Merge "added metrics constant to proto" 2016-10-19 03:36:11 +00:00
Svetoslav Ganov
10fb784107 Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev am: d48bd27f0e am: 6a2ada0a0a 
am: f5d0bbe94a  -s ours

Change-Id: I5e7a93c0149f06b5f62e20dc66f8e2873bdadb61
 2016-10-19 02:03:16 +00:00
Svetoslav Ganov
551cad7f97 [DO NOT MERGE] Catch a missed case when adding a toast am: 5c90c5e32e am: a9aa78b1fd 
am: 6c693aa777  -s ours

Change-Id: I9655800f21529872b77c282b0b2ea159b65d5cfd
 2016-10-19 02:02:19 +00:00
Svetoslav Ganov
f5d0bbe94a Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev am: d48bd27f0e 
am: 6a2ada0a0a

Change-Id: I3fa265e516b958f23e916fcf6fd702707cd1969f
 2016-10-19 01:56:18 +00:00
Svetoslav Ganov
6c693aa777 [DO NOT MERGE] Catch a missed case when adding a toast am: 5c90c5e32e 
am: a9aa78b1fd

Change-Id: Iba49fa7331a183fe14cd87583a8614552f33aadd
 2016-10-19 01:55:18 +00:00
TreeHugger Robot
a5da5d6ee7 Merge "Un-hide ROTATION_ANIMATION_SEAMLESS." 2016-10-19 01:50:24 +00:00
Svetoslav Ganov
6a2ada0a0a Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev 
am: d48bd27f0e

Change-Id: I9fbbbbe709dbf308fa4b2678ede416e68f59c057
 2016-10-19 01:47:51 +00:00
Svetoslav Ganov
a9aa78b1fd [DO NOT MERGE] Catch a missed case when adding a toast 
am: 5c90c5e32e

Change-Id: Ie9273caa0918a95a87c5bdb26ebc80ef2d4c22c0
 2016-10-19 01:47:48 +00:00
Chris Thornton
7bad6c7e17 Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev am: 23655af585 am: 1696610b17 
am: 1ff7f78266

Change-Id: Iae8f6d22b7f6b2d81d7aebb5d22e360a41b9ede0
 2016-10-19 01:42:01 +00:00
Chris Thornton
b587d8d2c8 Only purge sound models that violate the new primary key constraint if they don't contain identical data. am: d5ff116403 am: 519b7837bb 
am: a7f3f1aa91

Change-Id: I5a376cac47bd279ed13116213b2a78ddcdae8eb2
 2016-10-19 01:40:52 +00:00
Svetoslav Ganov
d48bd27f0e Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev 2016-10-19 01:35:37 +00:00
Chris Thornton
1ff7f78266 Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev am: 23655af585 
am: 1696610b17

Change-Id: I8f0a9be6ed53a7e585f1c11752ee707372fa4764
 2016-10-19 01:34:48 +00:00
Chris Thornton
a7f3f1aa91 Only purge sound models that violate the new primary key constraint if they don't contain identical data. am: d5ff116403 
am: 519b7837bb

Change-Id: I7788e4a5a09ba918e4a142bebf797af4db3b8afe
 2016-10-19 01:33:45 +00:00
Chris Thornton
1696610b17 Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev 
am: 23655af585

Change-Id: Idc6e7aeef68d16a13a707968ff3805a6d87b2bc3
 2016-10-19 01:26:48 +00:00
Chris Thornton
519b7837bb Only purge sound models that violate the new primary key constraint if they don't contain identical data. 
am: d5ff116403

Change-Id: I3e205134832a7abeb4d9d2aca3b7c5600fc22239
 2016-10-19 01:26:45 +00:00
TreeHugger Robot
23655af585 Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev 2016-10-19 01:17:05 +00:00
Svetoslav Ganov
28928d8f58 Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev am: 76043cf69f am: b3a8fc9835 
am: 7952934a1a

Change-Id: Ia20abb4984537a70e066f67a12ef55626a473813
 2016-10-19 01:04:51 +00:00
Svet Ganov
3b40a74ef9 Validate input for ContentService#setIsSyncable am: 96b9c75cec am: ba7bd1fe06 
am: 792fef2716

Change-Id: I222d335e4b3ca153e1caaa0f3006268d4d5fa6b9
 2016-10-19 01:03:55 +00:00
Keun-young Park
d340d8a135 fix wrong trace from IpConnectivityMetrics 
- should use only traceEnd() after traceBeginAndSlog

bug: 32256110
Test: manual log check
Change-Id: If7dcceacd316450990402a1a20877ceb8c85a098
 2016-10-18 18:02:03 -07:00
Svetoslav Ganov
7952934a1a Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev am: 76043cf69f 
am: b3a8fc9835

Change-Id: I783cc8665433ac22ab0b4eb1da39e9714b009117
 2016-10-19 00:57:08 +00:00
Svet Ganov
792fef2716 Validate input for ContentService#setIsSyncable am: 96b9c75cec 
am: ba7bd1fe06

Change-Id: If0e95400a089804fac54ae946650a353b8d039ef
 2016-10-19 00:56:16 +00:00
Svetoslav Ganov
b3a8fc9835 Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev 
am: 76043cf69f

Change-Id: I89c6415c45320a1825bf2bca26ec64a9e308d46d
 2016-10-19 00:42:58 +00:00
Svet Ganov
ba7bd1fe06 Validate input for ContentService#setIsSyncable 
am: 96b9c75cec

Change-Id: Ib39782e880a528be297d673134d7609e68ed313d
 2016-10-19 00:42:53 +00:00
Jordan Liu
b53000dd8c Merge "Add key for sms_convert_destination_number" 2016-10-19 00:40:43 +00:00
Svetoslav Ganov
76043cf69f Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev 2016-10-19 00:33:02 +00:00
Hemal Patel
ea2402628d Merge "Docs: Fixed a broken link" into nyc-dev am: b361f519dc am: 2a2c0fb96a am: b841c2d845 am: 6fe03a8529 
am: 889aad4625

Change-Id: Ic2a580203dd3a2cf1a6702b3c6c900ea1ae16831
 2016-10-18 23:39:08 +00:00
Hemal Patel
27ca7569a5 Docs: Fixed a broken link am: 9a641b6989 am: 40aaf53920 am: 8068fdca0c am: c9f68a8be3 
am: acaeb09715

Change-Id: I85d667af5fd5fe01501c5f72b6e5419cdd27fc1d
 2016-10-18 23:37:49 +00:00
Hemal Patel
889aad4625 Merge "Docs: Fixed a broken link" into nyc-dev am: b361f519dc am: 2a2c0fb96a am: b841c2d845 
am: 6fe03a8529

Change-Id: I8274f3ed022f561b2aa4ecb13a5d78e30ce59fd5
 2016-10-18 23:24:53 +00:00
Hemal Patel
acaeb09715 Docs: Fixed a broken link am: 9a641b6989 am: 40aaf53920 am: 8068fdca0c 
am: c9f68a8be3

Change-Id: I9636eef5a4cfeb8ab875aa15cbfaba20a1c80dcb
 2016-10-18 23:23:38 +00:00
Adam Lesinski
4803e284bd Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev am: 0858d08a88 am: 93e4720813 
am: c31b8c95ad

Change-Id: I552e9467d11d648e00c337dc711ad56fbab9dd27
 2016-10-18 23:17:12 +00:00
Hemal Patel
6fe03a8529 Merge "Docs: Fixed a broken link" into nyc-dev am: b361f519dc am: 2a2c0fb96a 
am: b841c2d845

Change-Id: I618a5f80027a2518dd1fb93697465adf011bf442
 2016-10-18 23:17:11 +00:00
Adam Lesinski
18ac1a74ae Fix regression with defaultDisplay adjustments am: f02523bf4b am: be75a58447 
am: cc903f425a

Change-Id: Id954c20f9d014cf26a4177f350f8941e6324adf3
 2016-10-18 23:16:13 +00:00
Hemal Patel
c9f68a8be3 Docs: Fixed a broken link am: 9a641b6989 am: 40aaf53920 
am: 8068fdca0c

Change-Id: Ic6d2bbcb23051f22e8a10e7d7573dc34b000f9a5
 2016-10-18 23:16:08 +00:00
Hemal Patel
b841c2d845 Merge "Docs: Fixed a broken link" into nyc-dev am: b361f519dc 
am: 2a2c0fb96a

Change-Id: I52c0fc44767f3b1102a8830e9e7910bf6d0db993
 2016-10-18 23:09:58 +00:00
Hemal Patel
8068fdca0c Docs: Fixed a broken link am: 9a641b6989 
am: 40aaf53920

Change-Id: I4888353281c101f92da0ce438e64531739c332be
 2016-10-18 23:08:56 +00:00
Adam Lesinski
c31b8c95ad Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev am: 0858d08a88 
am: 93e4720813

Change-Id: I5270f2413ca90ac58c0917b48d9959bab81b1c4a
 2016-10-18 23:04:50 +00:00