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

275126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
224ffd3cb2 Merge "[AssetManager]:Fix thread race caused double free issue." am: 126e022095 am: f48d0b8f19 
am: 73b91c63ad

Change-Id: I27f5cc6106f0a8f0a58721e1e8ed836144347b6a
 2016-10-03 20:26:41 +00:00
Adam Lesinski
73b91c63ad Merge "[AssetManager]:Fix thread race caused double free issue." am: 126e022095 
am: f48d0b8f19

Change-Id: Ia7da9ff37d813729a8c916a3b6e378110045aa17
 2016-10-03 20:21:46 +00:00
Adam Lesinski
f48d0b8f19 Merge "[AssetManager]:Fix thread race caused double free issue." 
am: 126e022095

Change-Id: I9928064b4811579bd50d4eeaff98bd4200b8bc7b
 2016-10-03 20:18:52 +00:00
Adam Lesinski
126e022095 Merge "[AssetManager]:Fix thread race caused double free issue." 2016-10-03 20:07:37 +00:00
Adarsh Fernando
b2361007e9 Docs: Redirect for Android Studio IR Flight Recorder am: 1face37061 
am: 164c750f8d

Change-Id: Ie7589409473d5efcae3d0c6477c8861d14b45472
 2016-10-03 16:02:19 +00:00
Adarsh Fernando
164c750f8d Docs: Redirect for Android Studio IR Flight Recorder 
am: 1face37061

Change-Id: If7cb92c670ef093f88314fd61dcb828abace5c31
 2016-10-03 15:53:57 +00:00
Tobias Thierer
041bb95132 Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f am: abc432fd09 
am: 19e46f91fa

Change-Id: I55ae235e9f1aa0e1442549408206fb9dcc0b6d91
 2016-10-03 14:05:33 +00:00
Tobias Thierer
19e46f91fa Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f 
am: abc432fd09

Change-Id: Iebccf0f8b271649596066807f0a59f5fefb3ee94
 2016-10-03 13:57:22 +00:00
Tobias Thierer
abc432fd09 Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" 
am: 01614e4e7f

Change-Id: Iaa1c3b284d4ff97799dd1939da34c088b95b7915
 2016-10-03 13:50:39 +00:00
Tobias Thierer
01614e4e7f Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" 2016-10-03 13:41:48 +00:00
Jakub Adamek
e60842aba3 Change name of overlay subdir property to sku. 
am: c03d9483f0

Change-Id: I1368890b9c2dde2c5177473da3af0872c0c937a1
 2016-10-03 10:30:14 +00:00
Jakub Adamek
c03d9483f0 Change name of overlay subdir property to sku. 
Also move the SKU subdirectories directly under /vendor/overlay.

Bug: 31692079
Change-Id: I68c712b13918cc99629534580ee4f77d9e5b3823
 2016-10-03 10:14:12 +01:00
Adarsh Fernando
1face37061 Docs: Redirect for Android Studio IR Flight Recorder 
Bug:31631770
Change-Id: Id3c4b8d141242521bef6364af2bbd47b950258c2
 2016-10-01 12:23:49 -07:00
Bill Yi
d9c364a654 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: c350547dcf  -s ours

Change-Id: Ie402c8356e404b6354cce97c10fee74ebd181ee5
 2016-10-01 09:02:40 +00:00
Bill Yi
949c4b8db8 Import translations. DO NOT MERGE 
am: 69fa3bcb6c  -s ours

Change-Id: I0d10347107ad3ff1c510d8b7ea8636478835687f
 2016-10-01 09:02:26 +00:00
Bill Yi
32414cd240 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 4408ea334a  -s ours

Change-Id: I2b9aef327cc6e5452aa7f3d7f2a83c6f7b82a6c2
 2016-10-01 09:00:44 +00:00
Bill Yi
315c1338a9 Import translations. DO NOT MERGE 
am: 28f02b2e72  -s ours

Change-Id: I74b0cce880afaa6392cba9a89173fc68155633c8
 2016-10-01 09:00:37 +00:00
TreeHugger Robot
c350547dcf Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-01 08:54:49 +00:00
TreeHugger Robot
4408ea334a Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-01 08:54:15 +00:00
Bill Yi
28f02b2e72 Import translations. DO NOT MERGE 
Change-Id: I6958c00c5473a46a9dcfeb60b6ce5f8159d11f1d
Auto-generated-cl: translation import
 2016-09-30 19:00:29 -07:00
Hemal Patel
622e4e3d42 Merge "Docs: Fixed the Service link" into nyc-dev am: b4be5089f3 
am: f9fd4c01f3

Change-Id: I37d85dd364b780d384388f4673c05a2ecef6be52
 2016-10-01 01:54:54 +00:00
Hemal Patel
417e4e4609 Docs: Fixed the Service link am: 1918214589 
am: e361f735d4

Change-Id: If7fc70c876f999c8a1d6635a3d39bbcc85708dc9
 2016-10-01 01:53:53 +00:00
Bill Yi
69fa3bcb6c Import translations. DO NOT MERGE 
Change-Id: Ia7e6389c2b54eb7e81af07a6d96a815f1cbbc8bd
Auto-generated-cl: translation import
 2016-09-30 18:52:22 -07:00
Hemal Patel
f9fd4c01f3 Merge "Docs: Fixed the Service link" into nyc-dev 
am: b4be5089f3

Change-Id: Ibcb3fa823e5a6191ceed1018e2e921ed1d1d9712
 2016-10-01 01:46:05 +00:00
Hemal Patel
e361f735d4 Docs: Fixed the Service link 
am: 1918214589

Change-Id: I52410cb0cccf0c1c99b13504672acdb0eadb9bc5
 2016-10-01 01:46:01 +00:00
TreeHugger Robot
b4be5089f3 Merge "Docs: Fixed the Service link" into nyc-dev 2016-10-01 01:36:15 +00:00
Tao Bao
5085ca1ecd Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev am: 473b048cf7 
am: 9d5021c2e1

Change-Id: I4ad0e3d0ff361b83b1646c5df15a2821ddcac344
 2016-09-30 23:26:32 +00:00
Tao Bao
4be858a801 Handle the race condition when calling uncrypt services. am: 1eabf53437 
am: 9bd481b3cf

Change-Id: Iaeeecf55fd66658f89b0abfd54e0b53869c1801c
 2016-09-30 23:25:24 +00:00
John Reck
60815b9b62 Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev am: 00515f8eab 
am: d6846db29e

Change-Id: I4f58726b96b9af926149cc5ea8805d0dfbebaae1
 2016-09-30 23:24:18 +00:00
John Reck
88123c4ef4 SurfaceView only call forceDisconnect if isValid am: 6ba466ff3e 
am: 5a0da698a7

Change-Id: I356848f7edb11304d9ab4584dab8e5895ff49762
 2016-09-30 23:23:17 +00:00
Tao Bao
9d5021c2e1 Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev 
am: 473b048cf7

Change-Id: Ica2b14c6372e12873290d3c3fc244bb0f03c305d
 2016-09-30 23:16:42 +00:00
Tao Bao
9bd481b3cf Handle the race condition when calling uncrypt services. 
am: 1eabf53437

Change-Id: Ia5ac4f91618c1cf4aee67d069542676cf0a5e787
 2016-09-30 23:16:37 +00:00
John Reck
d6846db29e Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev 
am: 00515f8eab

Change-Id: I016ee20efafd4b3261c8d47fc1ee080a592dbefa
 2016-09-30 23:15:10 +00:00
John Reck
5a0da698a7 SurfaceView only call forceDisconnect if isValid 
am: 6ba466ff3e

Change-Id: I890142436b2442cced212550ac916bedf1306bc9
 2016-09-30 23:15:04 +00:00
Tao Bao
473b048cf7 Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev 2016-09-30 23:07:38 +00:00
TreeHugger Robot
00515f8eab Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev 2016-09-30 23:05:50 +00:00
Hemal Patel
b44df3cf02 Merge "Docs: Fixed the code sample" into nyc-dev am: 91690d0c68 am: 3b097c9980 am: ab262da7df 
am: 896ee296fc

Change-Id: Iaf77a59fe9e7bb602cd29a3f309ab36e8029b729
 2016-09-30 23:03:52 +00:00
Hemal Patel
edeb2c229b Docs: Fixed the code sample am: a80822a98b am: 313b1d7310 am: d44d34d329 
am: 0af4f5eddd

Change-Id: I84d623bfb1d362c81ede70cc81799817aefb3fdf
 2016-09-30 23:02:49 +00:00
Hemal Patel
896ee296fc Merge "Docs: Fixed the code sample" into nyc-dev am: 91690d0c68 am: 3b097c9980 
am: ab262da7df

Change-Id: I7f94f4863beb2bd93523459aebd34c2546725408
 2016-09-30 22:56:49 +00:00
Hemal Patel
0af4f5eddd Docs: Fixed the code sample am: a80822a98b am: 313b1d7310 
am: d44d34d329

Change-Id: I3f74ab6f0968dc20e55738996b930c29d9912628
 2016-09-30 22:55:45 +00:00
Hemal Patel
8e17844561 Merge "Docs: Fixed the code sample" into nyc-dev am: 91690d0c68 
am: 0b2316b41e

Change-Id: I0629a3deee8ce0ac58177d289f82d6c736e22667
 2016-09-30 22:49:47 +00:00
Hemal Patel
ab262da7df Merge "Docs: Fixed the code sample" into nyc-dev am: 91690d0c68 
am: 3b097c9980

Change-Id: I0b7923ca2f6bd6b4dffe3e535d89d3a42697b8ee
 2016-09-30 22:49:43 +00:00
Hemal Patel
ab6320720f Docs: Fixed the code sample am: a80822a98b 
am: f87a5a47d6

Change-Id: I634bb6bd8e89f1ed25f99c3cc498470f5995d744
 2016-09-30 22:48:43 +00:00
Hemal Patel
d44d34d329 Docs: Fixed the code sample am: a80822a98b 
am: 313b1d7310

Change-Id: I225d1eafeacf85a19c86c28b413e550c824a8282
 2016-09-30 22:48:41 +00:00
Tyler Gunn
2f16c15a03 Merge "Increase char limit for string." into nyc-mr1-dev am: 971c42180b 
am: c47ad5972d

Change-Id: Iae6f292ae1c4d054d792402bcb4452395f83e317
 2016-09-30 22:45:22 +00:00
Tyler Gunn
3174d3f94b Increase char limit for string. am: be6919995f 
am: 93eedcc9f3

Change-Id: I0130cdd92b8d339290271a58101ab1e436d46933
 2016-09-30 22:44:26 +00:00
Hemal Patel
0b2316b41e Merge "Docs: Fixed the code sample" into nyc-dev 
am: 91690d0c68

Change-Id: I255a5716f31a3d49c9f8933a8d4796fec9d36973
 2016-09-30 22:42:16 +00:00
Hemal Patel
3b097c9980 Merge "Docs: Fixed the code sample" into nyc-dev 
am: 91690d0c68

Change-Id: I3f6874ac6b77782f49f566641ad9c3cc4df3979c
 2016-09-30 22:42:15 +00:00
Hemal Patel
313b1d7310 Docs: Fixed the code sample 
am: a80822a98b

Change-Id: Ib8146f5e2817e13caf9cc8f91e47423356423d8e
 2016-09-30 22:42:12 +00:00
Hemal Patel
f87a5a47d6 Docs: Fixed the code sample 
am: a80822a98b

Change-Id: Ibff20909ca0dfdf4ee2686ca3a9f797d9cda3b19
 2016-09-30 22:42:11 +00:00