Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
276,559 Commits 3 Branches 0 Tags
9dce7cdf13f4e2efecd6448a1453b2fbd03959cf
Commit Graph

276559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Svetoslav Ganov
76043cf69f Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev 2016-10-19 00:33:02 +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
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
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
Adam Lesinski
cc903f425a Fix regression with defaultDisplay adjustments am: f02523bf4b 
am: be75a58447

Change-Id: I748eaefa1a99b9af5101177090cf906267620f0b
 2016-10-18 23:03:51 +00:00
Hemal Patel
2a2c0fb96a Merge "Docs: Fixed a broken link" into nyc-dev 
am: b361f519dc

Change-Id: I715603d2fe5f7d21b93c663dc7109d4ee5abaf74
 2016-10-18 23:01:56 +00:00
Hemal Patel
40aaf53920 Docs: Fixed a broken link 
am: 9a641b6989

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

Change-Id: Idc8f2c1685c11d301d9fb4323a21e6d14c4ae594
 2016-10-18 22:55:17 +00:00
Adam Lesinski
be75a58447 Fix regression with defaultDisplay adjustments 
am: f02523bf4b

Change-Id: I7e96a95bcb75ee0b286e73024f62391cc1b759dd
 2016-10-18 22:55:14 +00:00
Hemal Patel
b361f519dc Merge "Docs: Fixed a broken link" into nyc-dev 2016-10-18 22:54:39 +00:00
TreeHugger Robot
0858d08a88 Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev 2016-10-18 22:46:24 +00:00
Adrian Roos
4fbbfc3088 Merge "Separate ambient display triggers" into nyc-mr1-dev am: 52af7e0759 
am: f07199a9b1

Change-Id: I2bb40f0548ac493ad2810dc54041951fc44ae474
 2016-10-18 22:41:45 +00:00
Chris Thornton
d5ff116403 Only purge sound models that violate the new primary key constraint if 
they don't contain identical data.

Bug: 32174118
Change-Id: Ied5e4e852337e5f819c7ded53dd941d79087ce73
 2016-10-18 15:36:27 -07:00
Adrian Roos
102aa8b6f1 Separate ambient display triggers am: b7e4e10618 
am: 59116440e7

Change-Id: I588f5541c73ae356b255ffa6b1e23c1fbcd1693e
 2016-10-18 22:19:43 +00:00
Adrian Roos
f07199a9b1 Merge "Separate ambient display triggers" into nyc-mr1-dev 
am: 52af7e0759

Change-Id: I61ccb55ed8d4226fa46fdad8dd7845dfae3bc2a3
 2016-10-18 22:12:53 +00:00
Adrian Roos
59116440e7 Separate ambient display triggers 
am: b7e4e10618

Change-Id: I575f96338cffa0f6e8adb1b9ff300dbd322398dc
 2016-10-18 22:07:03 +00:00
Adrian Roos
52af7e0759 Merge "Separate ambient display triggers" into nyc-mr1-dev 2016-10-18 22:00:06 +00:00
Fan Zhang
731e3b6b20 Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev am: 964874e444 
am: d0560f097a

Change-Id: I0793226266472697b2ef68419706cd38952efa6f
 2016-10-18 21:45:30 +00:00
Fan Zhang
383fd2e9b6 Catch NPE on network state and fall back to empty summary. am: 6acb76621d 
am: d856752ee7

Change-Id: Id1f17b2d60627110c1c7a3ae9aac3a7496f534f1
 2016-10-18 21:44:31 +00:00
Fan Zhang
d0560f097a Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev 
am: 964874e444

Change-Id: I86e665b3aee0d01dcbec3040e51efeb60b8f2f0e
 2016-10-18 21:37:35 +00:00
Brad Ebinger
80cb63df92 Merge "Add support for new SessionManager and EventManager tests" am: 42598f4a96 
am: cedb97bfb6

Change-Id: I8f24b19fadecea0cea945ba96bd885b6e8030b06
 2016-10-18 21:37:35 +00:00
Fan Zhang
d856752ee7 Catch NPE on network state and fall back to empty summary. 
am: 6acb76621d

Change-Id: I208a614e1a29c0d0e523d712ea184ee87fc04254
 2016-10-18 21:37:30 +00:00
Brad Ebinger
cedb97bfb6 Merge "Add support for new SessionManager and EventManager tests" 
am: 42598f4a96

Change-Id: I9c629074ca39dfb06bd6b16217ba5e59a9e0a004
 2016-10-18 21:30:57 +00:00
TreeHugger Robot
964874e444 Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev 2016-10-18 21:27:47 +00:00
Brad Ebinger
42598f4a96 Merge "Add support for new SessionManager and EventManager tests" 2016-10-18 21:22:19 +00:00
Adam Lesinski
0efc2ed89b Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev am: 212a6f264f 
am: f851c07b85

Change-Id: Ia157a60515b3130fa8a77886c27c55bb5cb85a25
 2016-10-18 20:55:01 +00:00
Adam Lesinski
08a870cd6d Fix race with Asset destruction and printing allocation stats am: 2582465bb4 
am: 882f8168b0

Change-Id: I613fabdaad38be88ff9c4527e100e33a87f9d601
 2016-10-18 20:53:59 +00:00
Adam Lesinski
f851c07b85 Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev 
am: 212a6f264f

Change-Id: I2f092b325c8b5333dc8435cf7b41a652d6c8b2be
 2016-10-18 20:40:54 +00:00
Adam Lesinski
882f8168b0 Fix race with Asset destruction and printing allocation stats 
am: 2582465bb4

Change-Id: I1dbb7609fa4d770e513e6f628e4c598600607383
 2016-10-18 20:40:50 +00:00