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

293937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sergeyv
98fa4f9e7b Use Bitmap in Texture.upload 
Test: refactoring cl.
bug:32216791

Change-Id: Ib0b16c878d8371e0471e9a502f55626ec5999c60
 2016-10-26 13:57:38 -07:00
Yoshinori Hirano
817695589c Merge "Allow operator/manufacturer setting to use priority" am: aef1a557aa am: 4244d53c3e am: 0be36ac0d1 
am: 80ac3f0a4b

Change-Id: I5bc6a440d7a906caed9cdfe63464f692e7f0ecef
 2016-10-24 18:50:17 +00:00
Yoshinori Hirano
80ac3f0a4b Merge "Allow operator/manufacturer setting to use priority" am: aef1a557aa am: 4244d53c3e 
am: 0be36ac0d1

Change-Id: I24b4d5ef74540cba4c90a134615eadd82b1c4a62
 2016-10-24 18:43:10 +00:00
Yoshinori Hirano
0be36ac0d1 Merge "Allow operator/manufacturer setting to use priority" am: aef1a557aa 
am: 4244d53c3e

Change-Id: Ia6fcaa0550f2e1bb74f61d547fcd39de3b95fe90
 2016-10-24 18:39:22 +00:00
Yoshinori Hirano
4244d53c3e Merge "Allow operator/manufacturer setting to use priority" 
am: aef1a557aa

Change-Id: I81ccdc0910ab5298d5b54f3b8e390262d02225ea
 2016-10-24 18:32:14 +00:00
Treehugger Robot
aef1a557aa Merge "Allow operator/manufacturer setting to use priority" 2016-10-24 18:21:07 +00:00
TreeHugger Robot
382d6ecc4b Merge "Merge SkiaCanvas changes from master-skia to master branch. Most changes are taken from ag/1407698, ag/1336660, ag/1488900." 2016-10-24 18:17:48 +00:00
Stan Iliev
f50806afb8 Merge SkiaCanvas changes from master-skia to master branch. 
Most changes are taken from ag/1407698, ag/1336660, ag/1488900.

Test: Built and run manually on angler-eng.
Change-Id: Id4e464b9a83c62b6bc7ea31a30e5ca6cd53b659d
 2016-10-24 12:16:13 -04:00
Mark Salyzyn
fa4c311438 Merge "PdfEditor: define LOG_TAG" am: a3bb8e3cc7 am: 9c0ea2d1cd am: 5aad37e70c 
am: 5be5a41170

Change-Id: Ia7ee2481592d3df55c3fda94cc1abfb4ea4a95cc
 2016-10-24 16:12:43 +00:00
Mark Salyzyn
5be5a41170 Merge "PdfEditor: define LOG_TAG" am: a3bb8e3cc7 am: 9c0ea2d1cd 
am: 5aad37e70c

Change-Id: I63b9ad911207f535c358cfd422a9b2990254de95
 2016-10-24 16:06:03 +00:00
Mark Salyzyn
5aad37e70c Merge "PdfEditor: define LOG_TAG" am: a3bb8e3cc7 
am: 9c0ea2d1cd

Change-Id: I61d351dd5b83e598fd59efbe9f414166a685fef7
 2016-10-24 15:59:34 +00:00
Mark Salyzyn
9c0ea2d1cd Merge "PdfEditor: define LOG_TAG" 
am: a3bb8e3cc7

Change-Id: Ide63ebe4228d7b7af05e20202baafdebf9699150
 2016-10-24 15:53:30 +00:00
Treehugger Robot
a3bb8e3cc7 Merge "PdfEditor: define LOG_TAG" 2016-10-24 15:47:32 +00:00
TreeHugger Robot
03db8e4b58 Merge changes I1a544a8d,Ie78d3fb0 
* changes:
  IpConnectivityMetrics: rate limit ApfProgramEvents
  IpConnectivityMetrics reads buffer size in settings
 2016-10-24 14:45:46 +00:00
Shigeki Yokomichi
4e5278165b Merge "Avoid NPE around mReusedTask of ActivityStarter" am: f741f88284 am: e79cb5c81d am: 77fc19fa8e 
am: 1a1b16f300

Change-Id: Id3e9355cf77c3003b16797bcb5683908fa80d983
 2016-10-24 14:42:31 +00:00
Shigeki Yokomichi
1a1b16f300 Merge "Avoid NPE around mReusedTask of ActivityStarter" am: f741f88284 am: e79cb5c81d 
am: 77fc19fa8e

Change-Id: I477db42ff85d52c07f29b844d7d251ce631251cd
 2016-10-24 14:35:29 +00:00
Shigeki Yokomichi
77fc19fa8e Merge "Avoid NPE around mReusedTask of ActivityStarter" am: f741f88284 
am: e79cb5c81d

Change-Id: I45c03d29bec22b59decb7c95bc1464dd83094c90
 2016-10-24 14:28:23 +00:00
Shigeki Yokomichi
e79cb5c81d Merge "Avoid NPE around mReusedTask of ActivityStarter" 
am: f741f88284

Change-Id: I64701d06c2e15b0ad11018c233fce32dce1caa52
 2016-10-24 14:21:25 +00:00
Treehugger Robot
f741f88284 Merge "Avoid NPE around mReusedTask of ActivityStarter" 2016-10-24 14:09:35 +00:00
Hugo Benichi
e1c173d224 IpConnectivityMetrics: rate limit ApfProgramEvents 
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).

Test: new test in IpConnectivityMetricsTest
Bug: 1550402
Change-Id: I1a544a8d62e6b02f0ed0088ab76c4bad338d2f44
 2016-10-24 21:54:37 +09:00
Hugo Benichi
05686dbb6b IpConnectivityMetrics reads buffer size in settings 
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637
Change-Id: Ie78d3fb03cea7883585549dac4f2063f0a8d9f4b
 2016-10-24 13:52:41 +09:00
Hugo Benichi
58a7220b89 Merge "TokenBucket for rate-limiting and throttling" 2016-10-24 04:48:37 +00:00
Shigeki Yokomichi
0bd28e2c5f Avoid NPE around mReusedTask of ActivityStarter 
Symptom:
System crash by NPE is observed on ActivityStarter
during phone boot-up.

Detail and sample:
ActivityStarter has possibility to be called itself recursively
by calling TaskRecord$performClearTaskLocked().
Then class variable of mReusedTask is initialized to null
after the call, because the recursive call isn't guarded by
synchronized block.
Then NPE crash occurs on next statement.

Solutions:
Avoid to use the class variable on null possibility statement.

Bug: 32361138

Change-Id: Iaea3e066a6f7134fcae4338ff864bb236241194c
 2016-10-24 13:30:49 +09:00
Pankaj Kanwar
2f85495003 Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev am: 9cac4568e5 am: 0d75ccf006 
am: 7332192158

Change-Id: Ie87138ea99e89ede8aab72eec001a5397226548c
 2016-10-24 02:26:54 +00:00
Lorenzo Colitti
d2b90fb119 CaptivePortalLogin: set mixed content policy to compatibility. am: 625166377b am: c9f79b3d1e 
am: b9dc4cf958

Change-Id: Id3bc3a25d75e0a11fefaf55b027dbe6336873459
 2016-10-24 02:25:50 +00:00
Pankaj Kanwar
7332192158 Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev am: 9cac4568e5 
am: 0d75ccf006

Change-Id: I7c147cf575e1040a82a7fe05a97a45e06108b010
 2016-10-24 02:20:20 +00:00
Lorenzo Colitti
b9dc4cf958 CaptivePortalLogin: set mixed content policy to compatibility. am: 625166377b 
am: c9f79b3d1e

Change-Id: I8430e6190e2c6170a00c6b8106416ca5801671db
 2016-10-24 02:19:19 +00:00
Pankaj Kanwar
0d75ccf006 Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev 
am: 9cac4568e5

Change-Id: I6b1d09378a0a9a82c0ac397ed920ae633232f044
 2016-10-24 02:13:18 +00:00
Lorenzo Colitti
c9f79b3d1e CaptivePortalLogin: set mixed content policy to compatibility. 
am: 625166377b

Change-Id: I536b2f5a80d3ceaed0ffa86501f6d60e2a407641
 2016-10-24 02:13:15 +00:00
Pankaj Kanwar
9cac4568e5 Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev 2016-10-24 02:02:51 +00:00
Bill Yi
9e1782e2ac Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 496d17f748 -s ours am: 0f106f5744 -s ours 
am: 28a2a4fe44  -s ours

Change-Id: I3a6b55feebc5c03861629eb035be7934375ddfd2
 2016-10-22 12:03:13 +00:00
Bill Yi
45276a60d9 Import translations. DO NOT MERGE am: 300ad2e4b0 -s ours am: adfb58ac37 -s ours 
am: 5171c42190  -s ours

Change-Id: I325cb89ffb79257ff7236ce5c44b7ed53773c135
 2016-10-22 12:02:17 +00:00
Bill Yi
61c084e710 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d849122bbb -s ours am: e7bdd3679c -s ours 
am: 492069d446  -s ours

Change-Id: I36933c0a24a9d79e628e00f6c5c3b0a8afad6c3a
 2016-10-22 11:58:52 +00:00
Bill Yi
5401ba0cdd Import translations. DO NOT MERGE am: 39eb3b4ac2 -s ours am: 28fbde286d -s ours 
am: 2ba167ff2b  -s ours

Change-Id: Ic2355247115c72dbaade8d20c11bc05524aaafdb
 2016-10-22 11:58:01 +00:00
Bill Yi
f94ccb3b93 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: be30f0d5ea -s ours 
am: 3501a750e5  -s ours

Change-Id: I73d837e4e9e13c5f96f12405e875a9ac26f469c7
 2016-10-22 11:57:07 +00:00
Bill Yi
1287266bfe Import translations. DO NOT MERGE am: 8758da732f -s ours 
am: d5deaa138e  -s ours

Change-Id: I6514cbb9efae55ad520c4e51d3fbeff3b600b22b
 2016-10-22 11:56:11 +00:00
Bill Yi
28a2a4fe44 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 496d17f748 -s ours 
am: 0f106f5744  -s ours

Change-Id: Ibab00657197612ed30ac08888826e3a7e132f5ad
 2016-10-22 11:55:18 +00:00
Bill Yi
28bfe648ff Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0cb41b80af -s ours 
am: 51650365a4  -s ours

Change-Id: If454b0069d943c2ed2af8a2410f83403e9cf6465
 2016-10-22 11:55:12 +00:00
Bill Yi
5171c42190 Import translations. DO NOT MERGE am: 300ad2e4b0 -s ours 
am: adfb58ac37  -s ours

Change-Id: I661ecca9565772febd4fb26027187de687d6e194
 2016-10-22 11:54:15 +00:00
Bill Yi
4903a6f932 Import translations. DO NOT MERGE am: c27fdce39f -s ours 
am: 0e033e38cc  -s ours

Change-Id: I55ca7034d0a22cd1122d20dfd5d0830e70b347ce
 2016-10-22 11:54:14 +00:00
Bill Yi
492069d446 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d849122bbb -s ours 
am: e7bdd3679c  -s ours

Change-Id: I0e7e7ccc36bb09246869c9eb7c4351ff44888458
 2016-10-22 11:49:18 +00:00
Bill Yi
2ba167ff2b Import translations. DO NOT MERGE am: 39eb3b4ac2 -s ours 
am: 28fbde286d  -s ours

Change-Id: Ib6de23cd75229a335ad8d318b6acc26d5c2da0b4
 2016-10-22 11:48:17 +00:00
Bill Yi
3501a750e5 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: be30f0d5ea  -s ours

Change-Id: I9d5c804341cf0ced313b8a82db933975b1089775
 2016-10-22 11:47:00 +00:00
Bill Yi
d5deaa138e Import translations. DO NOT MERGE 
am: 8758da732f  -s ours

Change-Id: I574899dc90e63b25b249c75dfde0e87c7b590621
 2016-10-22 11:46:56 +00:00
Bill Yi
51650365a4 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 0cb41b80af  -s ours

Change-Id: I9dd31230b3ee011d36e1324c4ab279cf30ef34c5
 2016-10-22 11:45:36 +00:00
Bill Yi
0e033e38cc Import translations. DO NOT MERGE 
am: c27fdce39f  -s ours

Change-Id: I0e59e72f0b24f846472adf0b20098fcd9ae4359a
 2016-10-22 11:45:32 +00:00
Bill Yi
0f106f5744 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 496d17f748  -s ours

Change-Id: I3c4017b2b089fafacf6b6951ca62da054363827f
 2016-10-22 11:42:09 +00:00
Bill Yi
adfb58ac37 Import translations. DO NOT MERGE 
am: 300ad2e4b0  -s ours

Change-Id: I6ecb8388aa2baa4733d75cee4628397e9d68e586
 2016-10-22 11:42:07 +00:00
Bill Yi
e7bdd3679c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: d849122bbb  -s ours

Change-Id: I8612211ea13a7f66963d2b378db3e5c3049a6c72
 2016-10-22 11:40:52 +00:00
Bill Yi
28fbde286d Import translations. DO NOT MERGE 
am: 39eb3b4ac2  -s ours

Change-Id: If06e606ce2c9ad83c680154bc7e5a8bd80af5207
 2016-10-22 11:40:50 +00:00