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

243121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
292dbde7a5 Merge "Merge commit \'1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f\' into manual_merge_1a510a3" into nyc-dev-plus-aosp 
am: e7965d4

* commit 'e7965d4a22492a947462c62b99e8db9f41d497ff':
  Remove support of disabling Jack.

Change-Id: I067b7f2d3290948e3fcf656a596645f804a3803b
 2016-03-31 18:08:07 +00:00
Ying Wang
e7965d4a22 Merge "Merge commit '1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f' into manual_merge_1a510a3" into nyc-dev-plus-aosp 2016-03-31 18:00:52 +00:00
Ying Wang
c2f612e048 Merge commit '1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f' into manual_merge_1a510a3 
Change-Id: I84953dc077a5dfea1290b952e2de73f9a6d34118
 2016-03-31 10:55:46 -07:00
Jason Monk
376f7d69bc Merge "Update the wifi on but disconnected qs icon" into nyc-dev am: becc301 
am: cdb9a75

* commit 'cdb9a75c103ea865bcd3f8f7ded860cc8a8411db':
  Update the wifi on but disconnected qs icon

Change-Id: Ie84c76b598074ede8e292c6bc205c8a6196d0d09
 2016-03-31 17:55:16 +00:00
Siyamed Sinir
6ca127ab0f Merge "Benchmarks for Linkify" into nyc-dev am: e14bab8 
am: 07fd581

* commit '07fd58158140b378cc4ab3261f401e1d05959e97':
  Benchmarks for Linkify

Change-Id: I2232d7568d3577839882810cf538aa0ef50ce235
 2016-03-31 17:55:15 +00:00
Joe Onorato
f518af881e Merge "Include process state in association tracking" into nyc-dev am: d0f83b7 
am: d1d3cfb1

* commit 'd1d3cfb1b6c150825a350f8354aee53a76506111':
  Include process state in association tracking

Change-Id: I6153f90327964ce67be3010a1026ece4b47d545c
 2016-03-31 17:55:12 +00:00
Chris Craik
0334f10170 Merge "Fix layer damage and clipping for Text shadows" into nyc-dev am: 08f41df 
am: 4f6bb3e

* commit '4f6bb3e0127bbce2269425e38f4c2c7a7900f197':
  Fix layer damage and clipping for Text shadows

Change-Id: Iee78899cd44291eaf0598b4e0be93fa3d31642ef
 2016-03-31 17:55:09 +00:00
Victor Chang
33bb07d632 Merge "Unit test for isProvisioningAllowed" into nyc-dev am: e04ac3d 
am: 55eed88

* commit '55eed88395da49b87d4ee79ca01486cec8f69961':
  Unit test for isProvisioningAllowed

Change-Id: Ie99abee24f7b7d0e083607956230332627c1985b
 2016-03-31 17:55:05 +00:00
Dongwon Kang
52e90e59f6 Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev am: 8904a1a 
am: 2703a4e

* commit '2703a4e7b128b784b31c0bf7d91458c803ef7278':
  TIF: Address comments on hardware manager related system APIs

Change-Id: If7a0226ae2448b59cb28d9503e4c5271a5605f78
 2016-03-31 17:55:00 +00:00
Sunny Goyal
c93e9f5b8a Merge "Chaning LauncherActivityInfo to return a density specific non-badged icon" into nyc-dev am: 56d3dd8 
am: 80d57ef

* commit '80d57efd94b7c394a39f78a2425d82aed5c75485':
  Chaning LauncherActivityInfo to return a density specific non-badged icon

Change-Id: Idda2dec39ecb821578ba213b4046e5210a6bfe63
 2016-03-31 17:54:51 +00:00
John Reck
a950f41ae4 Merge "Expand JankTracker" into nyc-dev am: c48dd5d 
am: 6fa7b46

* commit '6fa7b4616e684f723f6eed1df2b0409cb103c716':
  Expand JankTracker

Change-Id: I3d8a1054fa52947aa83477837fd3bc0f919ad778
 2016-03-31 17:54:12 +00:00
Wei Liu
51d92c55ca Merge "Start the Wear bluetooth service in SystemServer." into nyc-dev am: 2049029 
am: 1304198

* commit '13041985265c10cb2e9a99519765447c3d48d1b3':
  Start the Wear bluetooth service in SystemServer.

Change-Id: Id1e8f848dd2d213c69d6685a0461798e77c80a5e
 2016-03-31 17:53:54 +00:00
Dongwon Kang
e7d8e38dbb Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev am: 8f647b5 
am: 3c9b498

* commit '3c9b4983a1f42523d061d09a0ef8ba89f7122320':
  TIF: Add more class documentation on TvInputManager

Change-Id: If32b728358ed77f4f4fe107a0d41effe85e24b56
 2016-03-31 17:53:40 +00:00
Jason Monk
cdb9a75c10 Merge "Update the wifi on but disconnected qs icon" into nyc-dev 
am: becc301

* commit 'becc30196dbd6ebe68726c984a448c90fa6ef167':
  Update the wifi on but disconnected qs icon

Change-Id: Ib3e3cee5f6c7e13103ac75270dbb3785ad828f7f
 2016-03-31 17:49:21 +00:00
Siyamed Sinir
07fd581581 Merge "Benchmarks for Linkify" into nyc-dev 
am: e14bab8

* commit 'e14bab859ef3a1e47eb063781d04dd32d92cf3e8':
  Benchmarks for Linkify

Change-Id: Ie4812aa87376f95a0824fc4e0d87a1eba335e534
 2016-03-31 17:49:19 +00:00
Joe Onorato
d1d3cfb1b6 Merge "Include process state in association tracking" into nyc-dev 
am: d0f83b7

* commit 'd0f83b7bcadc6cfa4f39ee99ea96e48591fd6539':
  Include process state in association tracking

Change-Id: Ifff023a305ed76b15966ef30812961f528e9b434
 2016-03-31 17:49:18 +00:00
Chris Craik
4f6bb3e012 Merge "Fix layer damage and clipping for Text shadows" into nyc-dev 
am: 08f41df

* commit '08f41dfb8c43e8d34d8723ef22fe96b580af4d56':
  Fix layer damage and clipping for Text shadows

Change-Id: I17147a76c8f02dd2933cc8ac5664d889ba7d0c26
 2016-03-31 17:49:15 +00:00
Victor Chang
55eed88395 Merge "Unit test for isProvisioningAllowed" into nyc-dev 
am: e04ac3d

* commit 'e04ac3d7d2027ea3149748ca6520405b7e1b1dbb':
  Unit test for isProvisioningAllowed

Change-Id: Iea35f43b2904476325800ac4e50d5da9300eb430
 2016-03-31 17:49:12 +00:00
Dongwon Kang
2703a4e7b1 Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev 
am: 8904a1a

* commit '8904a1a1df404149be94ee7df600eda1de177ff4':
  TIF: Address comments on hardware manager related system APIs

Change-Id: I0ef721b3b15a3c6358cb8f34cd2427bd311ce738
 2016-03-31 17:49:09 +00:00
Sunny Goyal
80d57efd94 Merge "Chaning LauncherActivityInfo to return a density specific non-badged icon" into nyc-dev 
am: 56d3dd8

* commit '56d3dd8af70f2b24aa7f2cabae025c5fea06a1c8':
  Chaning LauncherActivityInfo to return a density specific non-badged icon

Change-Id: I642e890b23bbd59be6fce6ddee1cb74be6b5f71a
 2016-03-31 17:49:05 +00:00
John Reck
6fa7b4616e Merge "Expand JankTracker" into nyc-dev 
am: c48dd5d

* commit 'c48dd5d81e2fadf33314f0e738fd9fc406c6c533':
  Expand JankTracker

Change-Id: I2c3c5a8e5a8d279f1457be6050674d5208135727
 2016-03-31 17:49:00 +00:00
Wei Liu
1304198526 Merge "Start the Wear bluetooth service in SystemServer." into nyc-dev 
am: 2049029

* commit '204902906894184487585dfef39da39939ba43c6':
  Start the Wear bluetooth service in SystemServer.

Change-Id: I9b34e8cc3d8f05ee624b6de5dbcd4aebe0999ace
 2016-03-31 17:48:55 +00:00
Dongwon Kang
3c9b4983a1 Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev 
am: 8f647b5

* commit '8f647b5cdb1f776dbc5d2127fe72a6cf40f95813':
  TIF: Add more class documentation on TvInputManager

Change-Id: Ie5035212f2d97a93aa2ca686bb814ffaf2175d1a
 2016-03-31 17:48:49 +00:00
Jason Monk
becc30196d Merge "Update the wifi on but disconnected qs icon" into nyc-dev 2016-03-31 17:40:20 +00:00
Jason Monk
be83cc0044 Update the wifi on but disconnected qs icon 
Change-Id: Icb3ef57e7fa540868716107206d710dc4048aa90
Fixes: 27900385
 2016-03-31 13:38:59 -04:00
Siyamed Sinir
e14bab859e Merge "Benchmarks for Linkify" into nyc-dev 2016-03-31 17:17:18 +00:00
Joe Onorato
d0f83b7bca Merge "Include process state in association tracking" into nyc-dev 2016-03-31 17:09:24 +00:00
Chris Craik
08f41dfb8c Merge "Fix layer damage and clipping for Text shadows" into nyc-dev 2016-03-31 17:08:04 +00:00
Victor Chang
e04ac3d7d2 Merge "Unit test for isProvisioningAllowed" into nyc-dev 2016-03-31 17:04:38 +00:00
Dongwon Kang
8904a1a1df Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev 2016-03-31 17:01:36 +00:00
Ying Wang
1a510a3c5c Merge "Remove support of disabling Jack." 
am: 4101448

* commit '410144887ec32d2bfc10554effce4f7d512ea568':
  Remove support of disabling Jack.

Change-Id: I81eb8fd195c9ee4e1a046485ad4c0e4a6ae0ac25
 2016-03-31 17:00:32 +00:00
Sunny Goyal
56d3dd8af7 Merge "Chaning LauncherActivityInfo to return a density specific non-badged icon" into nyc-dev 2016-03-31 16:56:31 +00:00
Ying Wang
410144887e Merge "Remove support of disabling Jack." 2016-03-31 16:53:12 +00:00
John Reck
c48dd5d81e Merge "Expand JankTracker" into nyc-dev 2016-03-31 16:49:29 +00:00
Wei Liu
2049029068 Merge "Start the Wear bluetooth service in SystemServer." into nyc-dev 2016-03-31 16:47:52 +00:00
Dongwon Kang
8f647b5cdb Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev 2016-03-31 16:46:35 +00:00
Wei Liu
48d3b63b60 Start the Wear bluetooth service in SystemServer. 
Change-Id: I4ca420d7adbb0edd6539fe4bf6ada05650164866
 2016-03-31 09:44:41 -07:00
Fyodor Kupolov
22954facda Merge "[FBE] Split accounts.db into two DE/CE databases" into nyc-dev am: 1b8189d 
am: df77ebe

* commit 'df77ebe2309d959e3587f3aa1af76b9c027d370e':
  [FBE] Split accounts.db into two DE/CE databases

Change-Id: I4f0579ceae8b9134e659e85eb100979d7e1972db
 2016-03-31 16:28:34 +00:00
Yi Kong
279b561c9d Merge "Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be" am: 4af3afb am: e5301af 
am: 86379e8

* commit '86379e85dab7c408374b8dca11adacd8b9b3d57a':
  Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be

Change-Id: I9d9c0538992b193b290f32f9cd89b3c377a134d5
 2016-03-31 16:25:38 +00:00
Fyodor Kupolov
df77ebe230 Merge "[FBE] Split accounts.db into two DE/CE databases" into nyc-dev 
am: 1b8189d

* commit '1b8189d825746ff7d786c28ecf69abbd481e7b05':
  [FBE] Split accounts.db into two DE/CE databases

Change-Id: I4d590d4edeabecb69e5e6b96ebc5c0fee6dabaa7
 2016-03-31 16:25:34 +00:00
Yi Kong
86379e85da Merge "Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be" am: 4af3afb 
am: e5301af

* commit 'e5301af3cb0628772e628c3e54dcf68d667168c4':
  Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be

Change-Id: Id8d925cbaf470a63c4100fed26a6e1ceefa29ffd
 2016-03-31 16:22:37 +00:00
Yi Kong
0cc64a9558 Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be am: 9272822 
am: dc2cceb

* commit 'dc2ccebacb2bf834390a976b0e3d7ed412337d92':
  Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be

Change-Id: I2b6c48d27b50b565856405b15a4420ff5e9b2a14
 2016-03-31 16:22:30 +00:00
Yi Kong
dc2ccebacb Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be 
am: 9272822

* commit '9272822dc0b3d0c41923bde2ec971e41fc42bf1a':
  Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be

Change-Id: Ic64640d55762a16fd6fc23011f58ddc932ee7d0b
 2016-03-31 16:19:33 +00:00
Yi Kong
e5301af3cb Merge "Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be" 
am: 4af3afb

* commit '4af3afb2419365f0733fbaa104d05242620840ac':
  Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be

Change-Id: Ia9f3c4f3d138ed988c074d6e37cdd5997db1f46f
 2016-03-31 16:19:32 +00:00
Fyodor Kupolov
1b8189d825 Merge "[FBE] Split accounts.db into two DE/CE databases" into nyc-dev 2016-03-31 16:16:48 +00:00
Yi Kong
8511a5b127 Merge "Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be" 2016-03-31 16:15:28 +00:00
Yi Kong
4af3afb241 Merge "Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be" 2016-03-31 16:15:15 +00:00
Yi Kong
9272822dc0 Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be 
Bug: 27762555
Change-Id: I03984f4319ba21976078b2b3dff1a857eb5ebd0a
(cherry picked from commit a7af7593fb41b7f67de8f3206233b576ebaaef48)
(cherry picked from commit c0f67813c31bd25ec40c98a4f1e77f98bdabbb48)
 2016-03-31 16:04:27 +00:00
Jason Monk
92a1061ba5 Merge "Remove panel paddings/margins when QS is customizing" into nyc-dev am: 33b3060 
am: f06a017

* commit 'f06a017540d8619a961bdfa0f091d59f08e1993f':
  Remove panel paddings/margins when QS is customizing

Change-Id: Ieeac8b2eb319c99373bae570973107d0d1728f8c
 2016-03-31 15:55:01 +00:00
Jason Monk
f06a017540 Merge "Remove panel paddings/margins when QS is customizing" into nyc-dev 
am: 33b3060

* commit '33b30609ff916a1a9476fdecbf60c19cff56f76c':
  Remove panel paddings/margins when QS is customizing

Change-Id: I0681f766d2f53c3a8911d37aa769194a8c6a5a89
 2016-03-31 15:52:00 +00:00