Alex Klyubin
ae10eb8f88
Merge "Remove support for DSA with SHA-512 from v2 sig verification." into nyc-dev
...
am: 3a21805
* commit '3a21805aa19d34b1aede3c14eab2292b0f91ee89':
Remove support for DSA with SHA-512 from v2 sig verification.
Change-Id: I37a7c268fbfc8d60ebded9c3ea6e0098c0c9610f
2016-03-31 20:52:12 +00:00
Alex Klyubin
3a21805aa1
Merge "Remove support for DSA with SHA-512 from v2 sig verification." into nyc-dev
2016-03-31 20:46:04 +00:00
George Mount
dc21c57aa0
Merge "Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""" into nyc-dev
...
am: 98aa25c
* commit '98aa25c2d9c1ac2ebacef7612f5103925ff84d94':
Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""
Change-Id: I449067238317b66090e036a40181c27ec892a01d
2016-03-31 20:20:45 +00:00
George Mount
98aa25c2d9
Merge "Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""" into nyc-dev
2016-03-31 20:14:04 +00:00
Roozbeh Pournader
2c915b99c6
Merge "Invalidate TextView after locale change" into nyc-dev
...
am: 1a08865
* commit '1a08865d1fed6634746e7ca19cdd30e028681fb1':
Invalidate TextView after locale change
Change-Id: Ic3c82bd2fc0553354e1ea8fc9cfcda7a3d565fc0
2016-03-31 19:43:08 +00:00
Roozbeh Pournader
1a08865d1f
Merge "Invalidate TextView after locale change" into nyc-dev
2016-03-31 19:37:55 +00:00
Christopher Tate
e6dc55c327
Merge "API review: WallpaperManager" into nyc-dev
...
am: 9c4ec06
* commit '9c4ec06988642e24f9cf9a0dd79d777526b0a0a6':
API review: WallpaperManager
Change-Id: If59d4cb7bc609fee139e0874dd70efc451367522
2016-03-31 19:33:49 +00:00
Chris Tate
9c4ec06988
Merge "API review: WallpaperManager" into nyc-dev
2016-03-31 19:24:42 +00:00
Alex Klyubin
dfb5772447
Remove support for DSA with SHA-512 from v2 sig verification.
...
Android platform does not support DSA with SHA-512. Thus, it does not
make sense to support this unsupported algorithm in APK Signature
Scheme v2.
Bug: 24331392
Change-Id: Ie90b3dd8dd67bad65c64dfb7f6bf427e8ed282ba
2016-03-31 12:06:18 -07:00
Nathan Harold
b2402f6ed5
Merge "Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED" into nyc-dev
...
am: 3dafea3
* commit '3dafea3177e0f962347000d58646ccebedfed203':
Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED
Change-Id: I64235eae353ef90f7e3206a649fc3c4978f002b3
2016-03-31 18:46:37 +00:00
Vladislav Kaznacheev
72e7feb221
Merge "Add wallpaper input consumer to WindowManagerService" into nyc-dev
...
am: b7d08c3
* commit 'b7d08c3f3cee0e1575739250c12923930a9a5dbe':
Add wallpaper input consumer to WindowManagerService
Change-Id: I0a80ffe5fcd4f12dbe295b81b4f357b9b119319c
2016-03-31 18:46:34 +00:00
Nathan Harold
3dafea3177
Merge "Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED" into nyc-dev
2016-03-31 18:43:36 +00:00
Vladislav Kaznacheev
b7d08c3f3c
Merge "Add wallpaper input consumer to WindowManagerService" into nyc-dev
2016-03-31 18:43:16 +00:00
Vladislav Kaznacheev
0d50d8660d
Add wallpaper input consumer to WindowManagerService
...
This is an input consumer similar to the one used when hiding the navbar,
but placed above wallpapers. It might be useful for processing touch
events over "desktop" in freeform MW mode.
Re-landing I9d6d28a624f750ad48fc39f9b149dd1f989cceba after fixing build.
Bug:26688904
Change-Id: I89fdabd9c72cdd4a1d7ca626c33ddc99ddea97f9
2016-03-31 18:42:22 +00:00
Robin Lee
8d0373c8fd
Merge "API to approve CA certificates" into nyc-dev
...
am: f1fe782
* commit 'f1fe782e912d3feed9cded8fb80b179c4ee5d09c':
API to approve CA certificates
Change-Id: Ia84876f692a79d159cbfadd5888d73557e111e37
2016-03-31 18:31:32 +00:00
John Reck
3c77e5aa9d
Merge "Add a callback for rendernode parentcount=0" into nyc-dev
...
am: bbb4c2e
* commit 'bbb4c2eb2e871977289a9c48f414962e46b56ddc':
Add a callback for rendernode parentcount=0
Change-Id: I8168b028ce61413da8ecea76e6531c5dde9ddb46
2016-03-31 18:31:30 +00:00
Robin Lee
f1fe782e91
Merge "API to approve CA certificates" into nyc-dev
2016-03-31 18:26:32 +00:00
John Reck
bbb4c2eb2e
Merge "Add a callback for rendernode parentcount=0" into nyc-dev
2016-03-31 18:24:49 +00:00
Roozbeh Pournader
fafb7575c7
Invalidate TextView after locale change
...
Bug: 19294390
Change-Id: Ie0f08ab84b386ef6daa2570ea4d5203a04763b06
2016-03-31 11:23:00 -07:00
George Mount
f643fb0250
Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""
...
This reverts commit 879a626f18 .
Change-Id: I6fd011fb86a2aa0e30ba41fdefa3e29c7771e647
2016-03-31 11:15:27 -07:00
Ruben Brunk
f5d1bc31fe
Merge "Include VR throttling limit in hardware properties." into nyc-dev
...
am: ee1062e
* commit 'ee1062e4c011578906edf08d340eff5a55ebe085':
Include VR throttling limit in hardware properties.
Change-Id: I5d404f5fe7ad36dfe5269f7acb148146b7c2eabf
2016-03-31 18:11:08 +00:00
Ruben Brunk
ee1062e4c0
Merge "Include VR throttling limit in hardware properties." into nyc-dev
2016-03-31 18:03:37 +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
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
Nathan Harold
29589fcd8a
Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED
...
Bug: 27878903
Change-Id: Ie0974cfb8abbb34275b846c288465a4c3e090eda
2016-03-31 10:47:28 -07:00
Joe Onorato
d0f83b7bca
Merge "Include process state in association tracking" into nyc-dev
2016-03-31 17:09:24 +00:00
Robin Lee
2f7e1e487c
API to approve CA certificates
...
Bug: 18224038
Change-Id: Id928872cd70dac5a5ecfdcd52150fe6dea544e3b
2016-03-31 18:06:44 +01: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
Gustav Sennton
505d64c23a
Merge "Simplify WebViewProviderInfo - move its logic into WebViewUpdateService." into nyc-dev
...
am: ef40c9a
* commit 'ef40c9acd558a38ae5ea69214c78dd36ef713d77':
Simplify WebViewProviderInfo - move its logic into WebViewUpdateService.
Change-Id: I7e80475f9c1dd279f435efabaad0673359260d26
2016-03-31 15:37:28 +00:00
Andrei Stingaceanu
4c0fc48aa7
Merge "AfW - suspend apps - API polish" into nyc-dev
...
am: aa60469
* commit 'aa604694450539b4c99901b0714efaa79db3c87d':
AfW - suspend apps - API polish
Change-Id: I0bbb5d6ddc8f81d70960d179cf5f37f913ccddd8
2016-03-31 15:36:58 +00:00
John Reck
44b49f070a
Add a callback for rendernode parentcount=0
...
Bug: 27709981
Fixes: 22565656
Change-Id: I1cb4461baf9069dc4e7ca6de10d5862578c107f4
2016-03-31 08:36:50 -07:00
Gustav Sennton
ef40c9acd5
Merge "Simplify WebViewProviderInfo - move its logic into WebViewUpdateService." into nyc-dev
2016-03-31 15:28:53 +00:00
Gustav Sennton
dbf5eb04e6
Simplify WebViewProviderInfo - move its logic into WebViewUpdateService.
...
The WebViewProviderInfo should now be ready to be added as an API to be
fetched from XTS tests (to avoid using reflection).
Move the logic for validation, signature checking and package info
fetching out of WebViewProviderInfo so that we can mock the coupling
between that logic and the system (e.g. the package manager).
Note: with this patch we stop caching valid webview packages in the
update service (we would still refetch them anyway when anything
important happened).
Bug: 27635535
Bug: 27736084
Change-Id: Ia455202d2fd5bc4e03dce0fd917d262bf942d1a3
2016-03-31 14:21:47 +01:00
Andrei Stingaceanu
aa60469445
Merge "AfW - suspend apps - API polish" into nyc-dev
2016-03-31 10:57:58 +00:00
Michal Karpinski
2d884a207b
Merge "Adjusting javadocs for process logging" into nyc-dev
...
am: 31f59f1
* commit '31f59f1106824594ab8d5d48391b785b8687c4b0':
Adjusting javadocs for process logging
Change-Id: Ia37bd42b2f7dffd71d08515a5d8b93771effbf57
2016-03-31 10:02:57 +00:00
Michal Karpinski
31f59f1106
Merge "Adjusting javadocs for process logging" into nyc-dev
2016-03-31 09:56:24 +00:00
Jeff Sharkey
4d5806d0e6
Merge changes Ifecff4f1,Ia302de46 into nyc-dev
...
am: 2c0ae91
* commit '2c0ae91f2d22b2c9a3b506d3a7f60bc31f72c57d':
Make preferred activities direct-boot aware.
Make Parcelable classes final, API cleanup.
Change-Id: I24829b73653a657a210e41fed6f199f4b8e4dac9
2016-03-31 06:57:16 +00:00
Jeff Sharkey
2c0ae91f2d
Merge changes Ifecff4f1,Ia302de46 into nyc-dev
...
* changes:
Make preferred activities direct-boot aware.
Make Parcelable classes final, API cleanup.
2016-03-31 06:48:55 +00:00
Jeff Sharkey
70168dde6e
Make Parcelable classes final, API cleanup.
...
Remove some Context methods that leaked through. Add lint rule to
recommend using List<? extends Parcelable> instead of Parcelable[].
Bug: 27932224, 27930145, 27932911
Change-Id: Ia302de46cdb0c5101fa175a09316df91aeefcf0d
2016-03-30 23:31:39 -06:00
Philip P. Moltmann
343e1d8aaf
Merge "Parse and validate txt records." into nyc-dev
...
am: c1ed9eb
* commit 'c1ed9ebec7e0148cee2b4fda5ee8019ffe987c96':
Parse and validate txt records.
Change-Id: Ibe162d646a955359670341d992a52793ebd2cd3f
2016-03-31 03:55:30 +00:00
Tomasz Mikolajewski
1372e9bd9a
Merge "Unhide DocumentsContract.EXTRA_ORIENTATION." into nyc-dev
...
am: 88f8675
* commit '88f8675471df616b4c302d4b294b711d63179e2d':
Unhide DocumentsContract.EXTRA_ORIENTATION.
Change-Id: I3464c298fcd770095146a2a16f9f2bcf44cbfcc3
2016-03-31 03:55:27 +00:00
Philip P. Moltmann
c1ed9ebec7
Merge "Parse and validate txt records." into nyc-dev
2016-03-31 03:52:50 +00:00
Jeff Sharkey
baa9a1a5d5
Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev
...
am: 4afe32d
* commit '4afe32d4934cc89371dce05d669e9b1bdbf14449':
Keep COLUMN_LOCAL_URI working for now.
Change-Id: I6d89ede091d3bc6b1620abd2638d28273be5feed
2016-03-31 03:50:25 +00:00
Tomasz Mikolajewski
88f8675471
Merge "Unhide DocumentsContract.EXTRA_ORIENTATION." into nyc-dev
2016-03-31 03:50:19 +00:00
Jeff Sharkey
4afe32d493
Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev
2016-03-31 03:46:14 +00:00
Philip P. Moltmann
312c61edab
Parse and validate txt records.
...
Bug: 27696905
Change-Id: I9affcf02a51c92a2be1c2bfc5efbd09065e100bc
2016-03-30 20:33:31 -07:00
Adam Lesinski
ed72f0e9ba
Merge "BatteryStats: Add ble scans to checkin data and start global ble scan timer" into nyc-dev
...
am: ac4dfec1
* commit 'ac4dfec1c6d684b7d0d8ce09a5cba8fa9003e3a4':
BatteryStats: Add ble scans to checkin data and start global ble scan timer
Change-Id: I70c38df715190c58809732d03835286ab18a2e27
2016-03-31 03:03:40 +00:00
Adam Lesinski
ac4dfec1c6
Merge "BatteryStats: Add ble scans to checkin data and start global ble scan timer" into nyc-dev
2016-03-31 02:58:26 +00:00
Amith Yamasani
54ef24779f
Merge "Fix a deadlock due to wtf in BaseBundle" into nyc-dev
...
am: 27c49d5
* commit '27c49d5790647cc0bb81cc76a999ae65fe4a34cc':
Fix a deadlock due to wtf in BaseBundle
Change-Id: I4049794185b9cc7d29828c13fe8a4441631230f8
2016-03-31 02:25:26 +00:00
Jeff Sharkey
27c49d5790
Merge "Fix a deadlock due to wtf in BaseBundle" into nyc-dev
2016-03-31 02:18:53 +00:00