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

298960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
42c2cbf5c3 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e -s ours 
am: f7a5a3b0ce  -s ours

Change-Id: Id10ecb75e1fe67ff44ef1e27ed1f18eb326c353d
 2016-12-08 17:22:52 +00:00
Svetoslav Ganov
5a76e8aec9 Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 638134c1d8 
am: 6a6516c57e

Change-Id: Id4b1cf9ccbe09de0ff83bb32cfd7eeb25fee7c9a
 2016-12-08 17:22:46 +00:00
Android Build Merger (Role)
93c495b2c4 Merge "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 6023fd1800 am: 61705a3e64 -s ours" 2016-12-08 17:22:14 +00:00
Bill Yi
ec97386557 Import translations. DO NOT MERGE am: d4bdbc314b -s ours 
am: d47bc2f25c  -s ours

Change-Id: I9f7b9b6165864e6e4e72dec0baaf1039070bce88
 2016-12-08 17:21:50 +00:00
Tyler Gunn
a7a96d1563 Merge "Add carrier configuration options to allow enforcing max conference size." 2016-12-08 17:21:38 +00:00
Svetoslav Ganov
03cbddb668 Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 6023fd1800 
am: 61705a3e64  -s ours

Change-Id: I5bdabb1e559c13ebcb1939b57c61800046076137
 2016-12-08 17:21:28 +00:00
Bill Yi
0c985d8957 Import translations. DO NOT MERGE am: ef89f62670 -s ours 
am: ec82e05e7b  -s ours

Change-Id: If44cec4ffff23361b3b8b68f7a919ac67f643fcc
 2016-12-08 17:19:00 +00:00
Bill Yi
237edac526 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e -s ours 
am: 19e2b518ff  -s ours

Change-Id: I4b314ea8424f4a14cbb0a9c173d6ada9c4501953
 2016-12-08 17:17:59 +00:00
Bill Yi
ec69ea62ad Import translations. DO NOT MERGE am: d4bdbc314b -s ours 
am: c52c508e8c  -s ours

Change-Id: I04809ca752482cd5d45d046e40e76e11a3808bd5
 2016-12-08 17:16:52 +00:00
Bill Yi
462d9a3335 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: c0b7e766b0  -s ours

Change-Id: I00f0418ff736f2cb861ae7f1339f9ed477215b74
 2016-12-08 17:16:51 +00:00
Bill Yi
f1a5ffbf99 Import translations. DO NOT MERGE 
am: b004945727  -s ours

Change-Id: I4287af7000efb01c1203276a6e1817f52504a560
 2016-12-08 17:16:49 +00:00
Bill Yi
d6c831513f Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: c0b7e766b0  -s ours

Change-Id: Ida46c6f5dceaf39a6d6490b2beae373b0b1e3e0f
 2016-12-08 17:16:41 +00:00
Bill Yi
6919758aba Import translations. DO NOT MERGE 
am: b004945727  -s ours

Change-Id: Iec1db28d743317ae912d92dab3fb42baee34bc11
 2016-12-08 17:16:37 +00:00
Bill Yi
f014d755a1 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: e1add91fa1  -s ours

Change-Id: I3c99e350f7130ea39ac29751f104fafc04dde0d2
 2016-12-08 17:15:12 +00:00
Bill Yi
a40b64efdd Import translations. DO NOT MERGE 
am: c30efc0214  -s ours

Change-Id: I93c5e34494eb4d3cb56ca3652406cc2a24d62fd4
 2016-12-08 17:15:09 +00:00
Bill Yi
f0ed05f4b7 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: e1add91fa1  -s ours

Change-Id: I2d00cfe8ab1f7d3aca0108531e2de070b73ce660
 2016-12-08 17:15:00 +00:00
Bill Yi
3831df7485 Import translations. DO NOT MERGE 
am: c30efc0214  -s ours

Change-Id: Iedcde15869e0c41d67c5549caefcf97cba7f4e73
 2016-12-08 17:14:54 +00:00
Bill Yi
a62eff1f94 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 7e212ae873  -s ours

Change-Id: I14cbe78cdcb23fd8f82103395f057dca03a3b171
 2016-12-08 17:13:32 +00:00
Bill Yi
83810d0665 Import translations. DO NOT MERGE 
am: c300be1cf4  -s ours

Change-Id: I4318b5a4b5d6f927c03696cfe2ee52f5940bbe99
 2016-12-08 17:13:31 +00:00
Bill Yi
71398a5624 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 7e212ae873  -s ours

Change-Id: I74f96038ba9a074e9359ae90a14eb6d756f91724
 2016-12-08 17:13:22 +00:00
Bill Yi
e7aa31539d Import translations. DO NOT MERGE 
am: c300be1cf4  -s ours

Change-Id: Id10d974799e3958fe899750bf07c229b96601868
 2016-12-08 17:13:17 +00:00
Bill Yi
217e5fc476 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: df9a47a79f  -s ours

Change-Id: I5bf1a9de6b0539b8115fb89c738ef903736c9cb4
 2016-12-08 17:12:00 +00:00
Bill Yi
ec82e05e7b Import translations. DO NOT MERGE 
am: ef89f62670  -s ours

Change-Id: Ia2a1482ed04988a1d47940402ec868c25e8bd95f
 2016-12-08 17:11:59 +00:00
Bill Yi
ceb0716eba Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: df9a47a79f  -s ours

Change-Id: I5f81a5beacd58d17fff694bc76987f7bf580a55c
 2016-12-08 17:11:44 +00:00
Bill Yi
42318626f2 Import translations. DO NOT MERGE 
am: ef89f62670  -s ours

Change-Id: I7e16f16bf5fbec60c9f1258cf1cd139c3e04377b
 2016-12-08 17:11:41 +00:00
Bill Yi
f7a5a3b0ce Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 3c54cdf15e  -s ours

Change-Id: Ia2d5e05d5c889b2559fb047f71fcb26732e2810e
 2016-12-08 17:10:13 +00:00
Bill Yi
d47bc2f25c Import translations. DO NOT MERGE 
am: d4bdbc314b  -s ours

Change-Id: I865d999e568c8194dfdb8b54d4e84a38ee2b8b7f
 2016-12-08 17:10:06 +00:00
Bill Yi
19e2b518ff Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 3c54cdf15e  -s ours

Change-Id: I4cdda925e378df0b674bae5c01ab9118d91d0dce
 2016-12-08 17:08:12 +00:00
Bill Yi
c52c508e8c Import translations. DO NOT MERGE 
am: d4bdbc314b  -s ours

Change-Id: Ib09ce8f953d127e4fdccaf3848f78678dc1f56b4
 2016-12-08 17:08:10 +00:00
Aart Bik
2e52bbbf96 Merge "Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 am: 278cad4793 am: 116a4e883d" into nyc-mr2-dev-plus-aosp 
am: 2e0e9363ac

Change-Id: I4c6d203601481a1f148a58df7c4ea9a9c55f00fa
 2016-12-08 17:05:39 +00:00
Aart Bik
9ebb477644 Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 am: 278cad4793 am: 116a4e883d 
am: 7df8a6dbf3

Change-Id: I5e2a38a4526d22ff3da8b32c0ade9a039697ab85
 2016-12-08 17:05:28 +00:00
Aart Bik
1be3422c36 Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 am: 278cad4793 am: 7eb917d5eb 
am: a0c8b340be  -s ours

Change-Id: Ie8be4af0a8a4e33865c1f502c0107c9ad41b3e17
 2016-12-08 17:04:03 +00:00
TreeHugger Robot
c0b7e766b0 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-12-08 17:00:40 +00:00
TreeHugger Robot
e1add91fa1 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-12-08 17:00:14 +00:00
TreeHugger Robot
7e212ae873 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-12-08 16:59:47 +00:00
TreeHugger Robot
df9a47a79f Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-12-08 16:59:19 +00:00
TreeHugger Robot
3c54cdf15e Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-12-08 16:58:52 +00:00
Jason Monk
9abca5e9f8 Cleanup and refactoring of test utilities 
- Make leak checking faster by converting to fakes
    - Requires making clean interfaces for all CallbackControllers
 - Integrate leak checking into the TestableContext

Test: runtest systemui
Change-Id: Ic57a06360d01a0323ef26735a543e9d1805459e2
 2016-12-08 11:41:59 -05:00
Adrian Roos
a91407f65b Merge "EmergencyCryptkeeperText: Make sure we update if airplane mode changes" into nyc-mr2-dev am: 1e1d5b07a6 
am: c1afd37135

Change-Id: I68cdf92635f04fccc0b844c704c750088176cbff
 2016-12-08 16:27:07 +00:00
Adrian Roos
077396733a EmergencyCryptkeeperText: Make sure we update if airplane mode changes am: 72abcdaec7 
am: 889c64a30b

Change-Id: Ied9deb2409509dcdee09f34afb02c4fed21772ce
 2016-12-08 16:26:03 +00:00
Svetoslav Ganov
d1002aede0 Merge "Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014 am: 9aed2f6f53" into nyc-mr2-dev-plus-aosp 
am: b7e7eb2e0f

Change-Id: Id8099ba1fcf1db8f6dfda8da2037a3c5707588ef
 2016-12-08 16:24:23 +00:00
Svetoslav Ganov
93fabcf7df Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014 am: 9aed2f6f53 
am: 5c465313aa

Change-Id: I38fcb22082d1ee37bbdb5aa33fa4392d103d5480
 2016-12-08 16:24:17 +00:00
Svetoslav Ganov
53a0ba667c Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014 am: 63499946b0 
am: cd92cc49d2  -s ours

Change-Id: Iad254f61059c4163b4947819a3240d56460bc686
 2016-12-08 16:22:49 +00:00
TreeHugger Robot
2add99d066 Merge "LayoutInflaterBuilder helper in systemui util" 2016-12-08 16:18:16 +00:00
Wale Ogunwale
ea92d97733 Don't return null in WS.getTopParentWindow on child detach 
Fixed issue with WindowState.getTopParentWindow() returning null when
the child window is removed from it's parent. In this case it should
return itself as the method documentation states.

Change-Id: Iae40ca21241306048cae136887afc88593a6898d
Fixes: 33446267
Test: bit FrameworksServicesTests:com.android.server.wm.WindowStateTests
 2016-12-08 07:33:13 -08:00
Geoffrey Pitsch
847eb5aba8 LayoutInflaterBuilder helper in systemui util 
Useful for tests that want to inflate production layouts but with
some classes replaced with Testable/Mock instances.  Located in
SystemUI until more clients can be found.

Test: See ag/1630107
Change-Id: I4addb4cb4adfdf8c3e8f065dd3926574dc352e84
 2016-12-08 09:36:45 -05:00
TreeHugger Robot
3c41744b8c Merge "Clear DISALLOW_ADD_USER user restriction when dpm remove-active-admin is called from shell" 2016-12-08 13:54:41 +00:00
Lorenzo Colitti
256d5cd65f Merge changes from topic 'framework-net-aosp' am: b92aa5bdfd am: 0a7f2d076d 
am: 9aa93df2b4

Change-Id: I4697d66a7a76bc7d135e843aa201caa5e8242ac4
 2016-12-08 11:35:03 +00:00
Etan Cohen
4e7b5c25d8 DO NOT MERGE: [CS] Remove timeout event after first available am: bf3b1bad15 -s ours am: a8b73b23d6 -s ours 
am: ce10ba98bf

Change-Id: If94bc1b3dd0ed5ad697656303ca434152b4a5b18
 2016-12-08 11:34:09 +00:00
Hugo Benichi
8cc63f2554 DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest am: 5d2654124e -s ours am: 2a2e22ab23 -s ours 
am: a053ead6a9

Change-Id: If2dc382184f3e00f67838ed348d454f3a9b0bc41
 2016-12-08 11:33:21 +00:00