Jeff Sharkey
f90abdebdb
Merge "Offer to cache ringtones in system DE storage." into nyc-dev am: 1ce5c28ba5
...
am: 2b2974dcef
* commit '2b2974dcef503da3b02c7bd67becad709ead7951':
Offer to cache ringtones in system DE storage.
2016-02-23 21:23:54 +00:00
Michael Wright
bf6da7ad01
Merge "Fix conditional when checking for confirm key."
2016-02-23 21:16:25 +00:00
Jeff Sharkey
2b2974dcef
Merge "Offer to cache ringtones in system DE storage." into nyc-dev
...
am: 1ce5c28ba5
* commit '1ce5c28ba54f31c0013542df81975148657b8229':
Offer to cache ringtones in system DE storage.
2016-02-23 21:12:27 +00:00
Jeff Sharkey
1ce5c28ba5
Merge "Offer to cache ringtones in system DE storage." into nyc-dev
2016-02-23 20:57:46 +00:00
Alan Viverette
7844b8a84c
Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev am: 0df7c98adf
...
am: cadb829532
* commit 'cadb829532016352d0b9dd99ffdda97818422941':
Remove @Nullable annotation from getDrawable() methods
2016-02-23 20:40:14 +00:00
Alan Viverette
cadb829532
Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev
...
am: 0df7c98adf
* commit '0df7c98adf75e2f8a176e742e1bb325aee2808e6':
Remove @Nullable annotation from getDrawable() methods
2016-02-23 20:34:58 +00:00
Alan Viverette
0df7c98adf
Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev
2016-02-23 20:30:08 +00:00
Jeff Sharkey
413573ac59
Offer to cache ringtones in system DE storage.
...
Ringtones often live on shared media, which is now encrypted with CE
keys and not available until after the user is unlocked. To improve
the user experience while locked, cache the default ringtone,
notification sound, and alarm sound in a DE storage area.
Bug: 26730753
Change-Id: Ie6ad7790af4c87dd25759df3ed017e3b91a2fb87
2016-02-23 13:27:00 -07:00
John Reck
fcb39f64ba
Merge "destroyHardwareResources in onStop()" into nyc-dev am: e5bfd2da4d
...
am: 5962a84e5f
* commit '5962a84e5ff6044adaf8b1dcee6902174c6a9027':
destroyHardwareResources in onStop()
2016-02-23 20:00:22 +00:00
Alan Viverette
fde0213716
Remove @Nullable annotation from getDrawable() methods
...
Developers usually do not need to check the result of getDrawable(), so
we shouldn't be annotating it like they do.
Bug: 27134828
Change-Id: I0db0ca806fd89c18781da452fe3f31ef344f3cca
2016-02-23 14:59:51 -05:00
John Reck
5962a84e5f
Merge "destroyHardwareResources in onStop()" into nyc-dev
...
am: e5bfd2da4d
* commit 'e5bfd2da4d60c90a137a1eb883802c13ae53273e':
destroyHardwareResources in onStop()
2016-02-23 19:52:41 +00:00
Chien-Yu Chen
d1733607cd
Merge "Camera2: Fix getInternalFormatSizes for depth" into nyc-dev
2016-02-23 19:52:20 +00:00
John Reck
e5bfd2da4d
Merge "destroyHardwareResources in onStop()" into nyc-dev
2016-02-23 19:45:09 +00:00
Tao Bai
c8ebe62cb8
Merge "Using addAssetPathAsSharedLibrary in WebViewDelegate" into nyc-dev am: eabebc1539
...
am: 8ecca7d7f7
* commit '8ecca7d7f79eac025192c86a0ef5516e6740e897':
Using addAssetPathAsSharedLibrary in WebViewDelegate
2016-02-23 19:09:30 +00:00
Tao Bai
8ecca7d7f7
Merge "Using addAssetPathAsSharedLibrary in WebViewDelegate" into nyc-dev
...
am: eabebc1539
* commit 'eabebc1539b7e8b412da33c9e462665087cb1bfc':
Using addAssetPathAsSharedLibrary in WebViewDelegate
2016-02-23 18:57:32 +00:00
Tao Bai
eabebc1539
Merge "Using addAssetPathAsSharedLibrary in WebViewDelegate" into nyc-dev
2016-02-23 18:52:15 +00:00
John Reck
d9b1607bd9
destroyHardwareResources in onStop()
...
Bug: 27286867
This hopefully makes everything fully-deterministic. It should
also fix some old annoyances around Bitmap lifecycle as they will
be released earlier in onStop() instead of waiting for
dispatchDetachedFromWindow() which may never happen.
Change-Id: I6e871760650780e327c0e42f62950c1052dd8019
2016-02-23 10:35:19 -08:00
Philipp Weiß
5aaf46adc7
Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev am: f398479e06
...
am: b737c71611
* commit 'b737c71611e21fdf591b1c0cbb8e32cc28cb8bea':
Remove deprecated APIs DPM.createUser, createAndInitializeUser
2016-02-23 18:06:24 +00:00
Philipp Weiß
b737c71611
Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev
...
am: f398479e06
* commit 'f398479e069c7accb1f96b06b32e086609342669':
Remove deprecated APIs DPM.createUser, createAndInitializeUser
2016-02-23 18:01:41 +00:00
Philipp Weiß
f398479e06
Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev
2016-02-23 17:53:58 +00:00
Tao Bai
eb1368ba02
Using addAssetPathAsSharedLibrary in WebViewDelegate
...
BUG: 27245306
Change-Id: I346bc526cd9d311c290f61d0de04e33d708b81c4
2016-02-23 09:01:28 -08:00
Wale Ogunwale
d6ee93118d
Merge "Only copy layout param title if it is different from the current one." into nyc-dev am: 70c0817b76
...
am: 7c8b1a873a
* commit '7c8b1a873a39d18b780f1c2b6236f9193e64fb92':
Only copy layout param title if it is different from the current one.
2016-02-23 16:17:48 +00:00
Wale Ogunwale
7c8b1a873a
Merge "Only copy layout param title if it is different from the current one." into nyc-dev
...
am: 70c0817b76
* commit '70c0817b76c255ac3c17e513a5545d7ef9e4126c':
Only copy layout param title if it is different from the current one.
2016-02-23 16:08:12 +00:00
Wale Ogunwale
70c0817b76
Merge "Only copy layout param title if it is different from the current one." into nyc-dev
2016-02-23 16:01:23 +00:00
Wale Ogunwale
1f240c9fbf
Only copy layout param title if it is different from the current one.
...
Fixes WindowManager_LayoutParamsTest failure introduced in ag/866860
Bug: 27297744
Change-Id: I27ebf5d35b074d6b9c1634bc7cd18bba2844352e
2016-02-23 07:54:03 -08:00
Jesse Hall
3f81b96990
Merge "PackageManager: add Vulkan system features" into nyc-dev am: 791a7df8b2
...
am: 03d2fb32c1
* commit '03d2fb32c157b9faa2ff47c90ecab749ee2574eb':
PackageManager: add Vulkan system features
2016-02-23 15:18:59 +00:00
Jesse Hall
03d2fb32c1
Merge "PackageManager: add Vulkan system features" into nyc-dev
...
am: 791a7df8b2
* commit '791a7df8b2d4cef843b109aa98a0a9e2ff429462':
PackageManager: add Vulkan system features
2016-02-23 15:15:43 +00:00
Jesse Hall
791a7df8b2
Merge "PackageManager: add Vulkan system features" into nyc-dev
2016-02-23 15:11:52 +00:00
Benjamin Franz
683e6defc3
Merge "Make user provisioning state SystemApi" into nyc-dev am: 72283fdb61
...
am: 6bd76ca08a
* commit '6bd76ca08a55bccdc8db1cd51592ebf40d3cfd76':
Make user provisioning state SystemApi
2016-02-23 13:58:54 +00:00
Benjamin Franz
6bd76ca08a
Merge "Make user provisioning state SystemApi" into nyc-dev
...
am: 72283fdb61
* commit '72283fdb61df5c057d105644f0ae35ae9ae248b5':
Make user provisioning state SystemApi
2016-02-23 13:55:20 +00:00
Benjamin Franz
72283fdb61
Merge "Make user provisioning state SystemApi" into nyc-dev
2016-02-23 13:51:08 +00:00
Benjamin Franz
eed2a8e165
Make user provisioning state SystemApi
...
These APIs are used by the SUW. To go with the convention that all SUW
APIs should be SystemApi, adding it to these ones.
Bug: 25858670
Change-Id: Icffc9cdc13fa87da3543d92308f87dd0c9764c81
2016-02-23 13:02:57 +00:00
Toby Sargeant
c9de4886ab
Merge "add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue" into nyc-dev am: cf7518f78a
...
am: 13d95c2afd
* commit '13d95c2afd92a30886a1427b333deab60dc167ca':
add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue
2016-02-23 10:40:22 +00:00
Toby Sargeant
13d95c2afd
Merge "add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue" into nyc-dev
...
am: cf7518f78a
* commit 'cf7518f78af84aaafc7cd38ff69eec357a5b3055':
add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue
2016-02-23 10:37:24 +00:00
Toby Sargeant
cf7518f78a
Merge "add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue" into nyc-dev
2016-02-23 10:35:09 +00:00
Tony Mak
622c00b810
Merge "Update javadoc of DISALLOW_OUTGOING_CALLS" into nyc-dev am: 38e638696a
...
am: 8d95e5fd05
* commit '8d95e5fd05d26e538a9867f9341c927d2cb83ff6':
Update javadoc of DISALLOW_OUTGOING_CALLS
2016-02-23 10:34:34 +00:00
Tony Mak
8d95e5fd05
Merge "Update javadoc of DISALLOW_OUTGOING_CALLS" into nyc-dev
...
am: 38e638696a
* commit '38e638696a054a23150aadf72c9c98e335bb8d9e':
Update javadoc of DISALLOW_OUTGOING_CALLS
2016-02-23 10:29:04 +00:00
Tony Mak
38e638696a
Merge "Update javadoc of DISALLOW_OUTGOING_CALLS" into nyc-dev
2016-02-23 10:24:50 +00:00
Dianne Hackborn
1718385e10
Merge "Fix issue #26695393 : Remove NEW_PICTURE and NEW_VIDEO broadcast" into nyc-dev am: 76c970de3c
...
am: 39d8714086
* commit '39d87140866399eaa6f7bb033f0f74342d2b1c52':
Fix issue #26695393 : Remove NEW_PICTURE and NEW_VIDEO broadcast
2016-02-23 03:40:35 +00:00
Dianne Hackborn
39d8714086
Merge "Fix issue #26695393 : Remove NEW_PICTURE and NEW_VIDEO broadcast" into nyc-dev
...
am: 76c970de3c
* commit '76c970de3ce83609f48531e8ea23e7973544b179':
Fix issue #26695393 : Remove NEW_PICTURE and NEW_VIDEO broadcast
2016-02-23 03:34:30 +00:00
Dianne Hackborn
76c970de3c
Merge "Fix issue #26695393 : Remove NEW_PICTURE and NEW_VIDEO broadcast" into nyc-dev
2016-02-23 03:26:48 +00:00
Svetoslav Ganov
095258e32b
Merge "Expose removed permissions flag as system API" into nyc-dev am: 5cd52bee32
...
am: de04cc55ff
* commit 'de04cc55ff3d779d475d36a85831afbcd9729e38':
Expose removed permissions flag as system API
2016-02-23 02:40:09 +00:00
Svetoslav Ganov
de04cc55ff
Merge "Expose removed permissions flag as system API" into nyc-dev
...
am: 5cd52bee32
* commit '5cd52bee32250e14f5eca14d9e82535a0f2f4f87':
Expose removed permissions flag as system API
2016-02-23 02:29:24 +00:00
Svetoslav Ganov
5cd52bee32
Merge "Expose removed permissions flag as system API" into nyc-dev
2016-02-23 02:21:01 +00:00
Svet Ganov
2a1376d9df
Expose removed permissions flag as system API
...
There are some permissions that were removed from the platform
and guard nothing but legacy apps may be checking them before
calling APIs. Hence, these apps should get the permissions as
expected despite them being a no-op. To address this the platform
declares removed permissions as normal permissions that are hidden
such that legacy apps can always get them. These permissions are
not shown in the UI. Play needs a way to filter out these
permissions like the platform as they have permissions UI too.
bug:23361760
Change-Id: I10f442dfc09a299ddc5480d8bf2db0bd786aec62
2016-02-22 18:10:49 -08:00
Chien-Yu Chen
884cd4c575
Merge "Camera2: Fix getInternalFormatSizes for depth" am: b999ad9eed am: 660162b8ee
...
am: 50a7e07327
* commit '50a7e0732798a05d488b62a85269dd71835760fa':
Camera2: Fix getInternalFormatSizes for depth
2016-02-23 01:48:32 +00:00
Chien-Yu Chen
50a7e07327
Merge "Camera2: Fix getInternalFormatSizes for depth" am: b999ad9eed
...
am: 660162b8ee
* commit '660162b8ee757295442c3395a0fa7514cf2a53f4':
Camera2: Fix getInternalFormatSizes for depth
2016-02-23 01:41:01 +00:00
Selim Cinek
e9f1afd636
Merge "Fixed a bug where the numpad wasn\'t working correctly" into nyc-dev am: 1a3ca220f7
...
am: 936778e600
* commit '936778e600ff3b84e44b1e701727ebe64a44f432':
Fixed a bug where the numpad wasn't working correctly
2016-02-23 01:36:13 +00:00
Chien-Yu Chen
660162b8ee
Merge "Camera2: Fix getInternalFormatSizes for depth"
...
am: b999ad9eed
* commit 'b999ad9eed912873feb3fc143f99ba87745d3e06':
Camera2: Fix getInternalFormatSizes for depth
2016-02-23 01:25:11 +00:00
Selim Cinek
0efe38d743
Merge "Made the Chronometer able to count downwards" into nyc-dev am: f1c6371587
...
am: 5cf8722f94
* commit '5cf8722f94021f0eb5078fceece80182a65144a8':
Made the Chronometer able to count downwards
2016-02-23 01:18:13 +00:00