Lifu Tang
175cb175df
Merge "Modified the API to make coverage test possible" into nyc-dev am: e1b5358bae
...
am: d70097b7c1
* commit 'd70097b7c14a9b227b8a9b4c976e3d35de6059eb':
Modified the API to make coverage test possible
2016-03-09 22:02:23 +00:00
Lifu Tang
d70097b7c1
Merge "Modified the API to make coverage test possible" into nyc-dev
...
am: e1b5358bae
* commit 'e1b5358bae5a311f427767fcf4800c3f03ac6bc1':
Modified the API to make coverage test possible
2016-03-09 21:58:11 +00:00
Lifu Tang
e1b5358bae
Merge "Modified the API to make coverage test possible" into nyc-dev
2016-03-09 21:53:17 +00:00
Lifu Tang
0f1ab04516
Modified the API to make coverage test possible
...
Bug: 27462840
Change-Id: Idfd2c3c108b25f8be9046fd4bb72dbc57edc24bd
2016-03-09 11:32:43 -08:00
Alan Viverette
6e772459b0
Merge "Add missing annotations, getters to GradientDrawable" into nyc-dev am: 0dda14c671
...
am: 3976b199e5
* commit '3976b199e5e2895b0d66479068862810d61d317d':
Add missing annotations, getters to GradientDrawable
2016-03-09 19:30:04 +00:00
Alan Viverette
3976b199e5
Merge "Add missing annotations, getters to GradientDrawable" into nyc-dev
...
am: 0dda14c671
* commit '0dda14c671e7c19841f963b0bc665da055738437':
Add missing annotations, getters to GradientDrawable
2016-03-09 19:26:55 +00:00
Alan Viverette
5f63721a6c
Add missing annotations, getters to GradientDrawable
...
Fixes getColor() NPE when colors array is null.
Bug: 27543512
Change-Id: Ieec8a2315d0a2e4ab0ddbe053bccdd8c43080857
2016-03-09 13:30:35 -05:00
Martijn Coenen
6e05f27bff
Merge "API to query which cores are exclusively assigned." into nyc-dev am: 2612bbc0f5
...
am: a249556f80
* commit 'a249556f80a88aa359d44fd71d6c8163c6a5b064':
API to query which cores are exclusively assigned.
2016-03-09 10:39:48 +00:00
Martijn Coenen
a249556f80
Merge "API to query which cores are exclusively assigned." into nyc-dev
...
am: 2612bbc0f5
* commit '2612bbc0f5ae5422ba3e8e685ae375b2b8626fda':
API to query which cores are exclusively assigned.
2016-03-09 10:37:45 +00:00
Martijn Coenen
2612bbc0f5
Merge "API to query which cores are exclusively assigned." into nyc-dev
2016-03-09 10:31:03 +00:00
Shubham Ajmera
5e0f99afb6
Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests" into nyc-dev am: 8710347fd9
...
am: 138d4b4ce1
* commit '138d4b4ce152fd03f1710938d10123febc233c5a':
Port OpenJDK8 java.util.*SummaryStatistics & add tests
2016-03-09 10:12:25 +00:00
Shubham Ajmera
138d4b4ce1
Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests" into nyc-dev
...
am: 8710347fd9
* commit '8710347fd96bc26c7f7760a261d8e889baf53ba2':
Port OpenJDK8 java.util.*SummaryStatistics & add tests
2016-03-09 10:10:24 +00:00
Shubham Ajmera
955c9ddc46
Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests" am: 66ca5ac738
...
am: d7b16e3578
* commit 'd7b16e35784555b288265887f65209bd4343df59':
Port OpenJDK8 java.util.*SummaryStatistics & add tests
2016-03-09 10:06:30 +00:00
Shubham Ajmera
d9f35f9831
Port OpenJDK8 java.util.*SummaryStatistics & add tests
...
Ported OpenJDK8 java.util.DoubleSummaryStatistics,
java.util.IntSummaryStatistics, java.util.LongSummaryStatistics.
Based on openJdk 8u40 source & iam@ stream change in
ag/872080
Bug: 27426738
(cherry picked from commit 2ff7afd862 )
Change-Id: Ia284503a3e5190e7c7f9adf812210ad3060f4a07
2016-03-09 10:04:47 +00:00
Shubham Ajmera
d7b16e3578
Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests"
...
am: 66ca5ac738
* commit '66ca5ac7381eda7be0f3792f2ab94c5108ae69ad':
Port OpenJDK8 java.util.*SummaryStatistics & add tests
2016-03-09 10:04:33 +00:00
Shubham Ajmera
66ca5ac738
Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests"
2016-03-09 09:57:17 +00:00
Makoto Onuki
3b0196122f
Merge "Implement LauncherApps.startShortcut()." into nyc-dev am: 76cb56bb21
...
am: 6e6a3ed250
* commit '6e6a3ed2502e5e6b07403a21e8e954a200fb0146':
Implement LauncherApps.startShortcut().
2016-03-09 01:47:10 +00:00
Makoto Onuki
76cb56bb21
Merge "Implement LauncherApps.startShortcut()." into nyc-dev
2016-03-09 01:38:37 +00:00
Makoto Onuki
43204b8357
Implement LauncherApps.startShortcut().
...
Bug 27548047
Change-Id: I357732e22be0959fb573fd6cdaee7c6b439ef7c4
2016-03-08 17:26:28 -08:00
Sudheer Shanka
80e6e6332b
Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev am: 97e89c624e
...
am: 6f0d578ea9
* commit '6f0d578ea97454e550586f58279bf868f24a2d53':
Update DPM.getWifiMacAddress to take admin component as argument.
2016-03-08 23:49:35 +00:00
Sudheer Shanka
97e89c624e
Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev
2016-03-08 22:52:11 +00:00
Dongwon Kang
33315dbb4f
Merge "TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent" into nyc-dev am: 08713d2a0e
...
am: 77e46befc8
* commit '77e46befc8ce665d88c22d34d500d1e3b24c8c7a':
TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent
2016-03-08 22:45:03 +00:00
Dongwon Kang
08713d2a0e
Merge "TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent" into nyc-dev
2016-03-08 22:11:13 +00:00
Yi Kong
f48f91b51c
Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d (part 2)
...
Bug: 27427010
Change-Id: I5527f34ef6bf15aaa1a39b705e951122ae4b3d5a
(cherry picked from commit 2f55bdf2e3 )
2016-03-08 20:47:19 +00:00
Yi Kong
2f55bdf2e3
Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d (part 2)
...
Bug: 27427010
Change-Id: I5527f34ef6bf15aaa1a39b705e951122ae4b3d5a
2016-03-08 19:14:21 +00:00
Dongwon Kang
e12d810e99
TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent
...
Bug: 25726685
Change-Id: If96d0b086488c931d20315ee1c29cf7374715d93
2016-03-08 10:53:09 -08:00
Makoto Onuki
af00108ca4
resolve merge conflicts of 1ca3800c44 to master
...
Change-Id: I4657cdf99900cd555c3109605e8cbdbb0fed79e6
2016-03-08 10:39:25 -08:00
Makoto Onuki
ed58f5f0aa
Merge "Introducing ShortcutManager" into nyc-dev
2016-03-08 18:01:05 +00:00
Julia Reynolds
9a49d6c8ac
Merge "Condition cleanup." into nyc-dev am: 4ed0e8cf8f
...
am: ad23e7bf78
* commit 'ad23e7bf78b3826ed2eb4866593386af1533a2b4':
Condition cleanup.
2016-03-08 17:47:00 +00:00
Julia Reynolds
4ed0e8cf8f
Merge "Condition cleanup." into nyc-dev
2016-03-08 17:39:01 +00:00
Jean-Michel Trivi
92b473df6c
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev am: 84dee4f16c
...
am: 2392ab9bbd
* commit '2392ab9bbd30ed5ffcab00aec1bb6b46552c484f':
Rename AudioRecordConfiguration to AudioRecordingConfiguration
2016-03-08 17:03:35 +00:00
Jean-Michel Trivi
84dee4f16c
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev
2016-03-08 16:46:58 +00:00
Yi Kong
c32718d4b6
Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d
...
Bug: 27427010
Change-Id: I5527f34ef6bf15aaa1a39b705e951122ae4b3d5a
2016-03-08 16:10:49 +00:00
Julia Reynolds
1d6d16d699
Condition cleanup.
...
Change-Id: If978bebac52c0b1438e86339669f409b4b17c6fc
2016-03-08 10:41:31 -05:00
Chris Wren
a06ef18843
Merge "rename the asisstant service for the ranker" into nyc-dev am: be3696d425
...
am: 4c2e7ad458
* commit '4c2e7ad4589a78dbbe35d585df4b4549db0e3292':
rename the asisstant service for the ranker
2016-03-08 15:05:26 +00:00
Chris Wren
be3696d425
Merge "rename the asisstant service for the ranker" into nyc-dev
2016-03-08 14:13:45 +00:00
Shubham Ajmera
2ff7afd862
Port OpenJDK8 java.util.*SummaryStatistics & add tests
...
Ported OpenJDK8 java.util.DoubleSummaryStatistics,
java.util.IntSummaryStatistics, java.util.LongSummaryStatistics.
Based on openJdk 8u40 source & iam@ stream change in
ag/872080
Bug: 27426738
Change-Id: I54f3fba1142327f990c0a71acbbef0b7bb0e0a27
2016-03-08 13:19:13 +00:00
Martijn Coenen
cd4bdf3eb9
API to query which cores are exclusively assigned.
...
On devices with cpuset support, the foreground app
may have a core exclusively assigned to it. Add an
API that allows apps to query which core that is,
so it can use that to set scheduling affinity.
Bug: 27381794
Change-Id: Iea148776da6d7abb745ccf9e6ad5ad46491e340a
2016-03-08 13:09:32 +01:00
Sudheer Shanka
3cb4da16dc
Update DPM.getWifiMacAddress to take admin component as argument.
...
Bug: 27532280
Change-Id: I3a5e9557c3c6ac43c458c911a5309bdb2655fb66
2016-03-07 18:51:49 -08:00
Daichi Hirono
3a10365583
Merge "Add a new key to Settings.Global to obtain the number of boot." into nyc-dev am: d517e6aeed
...
am: e07d5b62ed
* commit 'e07d5b62ed6d58f8f81383e6ecde03b1181e08f3':
Add a new key to Settings.Global to obtain the number of boot.
2016-03-08 02:16:09 +00:00
Daichi Hirono
d517e6aeed
Merge "Add a new key to Settings.Global to obtain the number of boot." into nyc-dev
2016-03-08 02:06:39 +00:00
Amit Mahajan
619ebe712b
Merge "New permission for bypassing premium short code check." into nyc-dev am: 0f90653ca1
...
am: bcbdfbb50b
* commit 'bcbdfbb50bf9ea0f66c458029dfae6eccec2fb1a':
New permission for bypassing premium short code check.
2016-03-08 01:22:26 +00:00
Amit Mahajan
0f90653ca1
Merge "New permission for bypassing premium short code check." into nyc-dev
2016-03-08 01:13:53 +00:00
Ruben Brunk
dbd8a7ac40
Merge "Add a VR listener service." into nyc-dev am: 875825d0c1
...
am: f05c96989c
* commit 'f05c96989cf1bd028cc7d63d31b4cab37ad3b9f2':
Add a VR listener service.
2016-03-08 00:27:39 +00:00
Ruben Brunk
875825d0c1
Merge "Add a VR listener service." into nyc-dev
2016-03-08 00:14:57 +00:00
Jean-Michel Trivi
598c0c9f65
Rename AudioRecordConfiguration to AudioRecordingConfiguration
...
In package android.media:
- rename AudioRecordConfiguration to
AudioRecordingConfiguration to avoid ambiguity with the
android.media.AudioRecord class
- rename AudioManager.getActiveRecordConfigurations() to
getActiveRecordingConfigurations.
Bug 27385560
Change-Id: I5ef404ff36522193990c9b563d4545893529b365
2016-03-07 16:05:51 -08:00
Ruben Brunk
e24b9a6cfa
Add a VR listener service.
...
Bug: 22855417
Bug: 26724891
Bug: 27364145
- Add an API for VrListenerService, which is bound/unbound
from the framework when the system VR mode changes.
- Allow only a single bound VrListenerService at a time.
- Monitor allowed VrListenerService implementations from
VrManagerService and evict services as needed when packages,
users, or settings change.
- Remove previous VR functionality in NotificationListenerService.
- Add component target to Activity#setVrMode to allow
explicit selection of the running VrListenerService from
the current VR activity.
Change-Id: I776335f4441be0e793d3126f2d16faf86a8c621a
2016-03-07 15:54:12 -08:00
Amit Mahajan
e5cd9fa439
New permission for bypassing premium short code check.
...
Bug: 18326557
Change-Id: I1b05f73103183b851bbef1280d0785ce0a48159a
2016-03-07 21:51:44 +00:00
Chris Wren
e0ba7eb365
rename the asisstant service for the ranker
...
Bug: 22960980
Change-Id: Ibe57933303a488b01c43a7621a488d425d6f707d
2016-03-07 16:50:27 -05:00
Jean-Michel Trivi
fb7a388b9d
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
am: 4f9c05c382
* commit '4f9c05c3823ea73b17fb6b14707dc2ce3f9d760c':
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
2016-03-07 21:11:44 +00:00