OSDN Git Service
Dimitry Ivanov [Mon, 21 Dec 2015 23:27:57 +0000 (15:27 -0800)]
Merge "Use shared namespace for bundled app classloader"
am:
76a9e55a8f
* commit '
76a9e55a8fd751e747511a9c7d02dddca31964c3':
Use shared namespace for bundled app classloader
Dimitry Ivanov [Mon, 21 Dec 2015 23:10:49 +0000 (23:10 +0000)]
Merge "Use shared namespace for bundled app classloader"
Chad Brubaker [Mon, 21 Dec 2015 19:01:01 +0000 (19:01 +0000)]
Merge "Add hostname aware isCleartextTrafficPermitted"
am:
a2f2c5c340
* commit '
a2f2c5c340b552b92088966734097845b76ea310':
Add hostname aware isCleartextTrafficPermitted
Chad Brubaker [Mon, 21 Dec 2015 18:52:48 +0000 (18:52 +0000)]
Merge "Add hostname aware isCleartextTrafficPermitted"
Geoff Mendal [Mon, 21 Dec 2015 15:01:38 +0000 (15:01 +0000)]
Import translations. DO NOT MERGE am:
fd87e92a42 -s ours
am:
bb107a854d -s ours
* commit '
bb107a854d64b5c7ed4d8d93fc4c836e9e21c4c1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 14:57:31 +0000 (14:57 +0000)]
Import translations. DO NOT MERGE
am:
72675c67d0 -s ours
* commit '
72675c67d052b69dbac3a01faf631de90533a1dd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 14:57:29 +0000 (14:57 +0000)]
Import translations. DO NOT MERGE
am:
fd87e92a42 -s ours
* commit '
fd87e92a42b659be5b120c59d9413d41e94b6753':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 14:53:38 +0000 (06:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5348b439170faa76b7d85ce1ab04cebeb0a17c69
Auto-generated-cl: translation import
Geoff Mendal [Mon, 21 Dec 2015 14:50:08 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: If00b01a244af6221a01d0c060c58da7389fd1b35
Auto-generated-cl: translation import
Calin Juravle [Mon, 21 Dec 2015 09:52:40 +0000 (09:52 +0000)]
Merge "Pass app\'s code paths to the runtime"
am:
db73912471
* commit '
db73912471df39aa527971f2884f37295616d3a9':
Pass app's code paths to the runtime
Calin Juravle [Mon, 21 Dec 2015 09:43:34 +0000 (09:43 +0000)]
Merge "Pass app's code paths to the runtime"
Dimitry Ivanov [Sat, 12 Dec 2015 01:34:21 +0000 (17:34 -0800)]
Use shared namespace for bundled app classloader
Allow bundled apps to reference platform native libraries
located in subdirectories of the default library path
(/system/lib/hw/* for example).
In addition to this bundled apps need to share native
libraries with default namespace. Added parameter to
ApplicationLoaders.createClassLoader() to do just that.
Bug:
26165097
Bug:
26164393
(cherry picked from commit
75b10ecccdd1881390075dd22c1d4f9bdf1c5828)
Change-Id: I836e5fed4713f2a605a5de673c40970ef6d988dd
Nick Kralevich [Sat, 19 Dec 2015 07:08:22 +0000 (07:08 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC"
am:
78d5f90d98
* commit '
78d5f90d98365987937b680862c4d88f3beaa4a3':
common_time_server.cpp: more O_CLOEXEC
Nick Kralevich [Sat, 19 Dec 2015 06:58:58 +0000 (06:58 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC"
Nick Kralevich [Sat, 19 Dec 2015 04:47:02 +0000 (20:47 -0800)]
common_time_server.cpp: more O_CLOEXEC
Change-Id: I2185a462d72e11f5a015c525d2d37c52ecc3e430
Bryce Lee [Fri, 18 Dec 2015 23:19:18 +0000 (23:19 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am:
9c27969385 am:
d980b8c7a0
am:
1b695edc97
* commit '
1b695edc97c227a64ef810daee7dc9f3b35206a7':
Remove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 23:13:51 +0000 (23:13 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am:
9c27969385
am:
d980b8c7a0
* commit '
d980b8c7a05a2dc51145c3465c14f1f106a8bc47':
Remove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 23:07:49 +0000 (23:07 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
am:
9c27969385
* commit '
9c27969385d7a59a535ba3274c279ae96a155d49':
Remove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 23:02:40 +0000 (23:02 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
Daniel Koulomzin [Fri, 18 Dec 2015 20:15:10 +0000 (12:15 -0800)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am:
cbef517d02 am:
898e330aae
am:
94794af6be
* commit '
94794af6bee35c249857f0440c361d589b77aa5d':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Robert Greenwalt [Fri, 18 Dec 2015 20:09:54 +0000 (12:09 -0800)]
Daniel Koulomzin [Fri, 18 Dec 2015 20:09:35 +0000 (20:09 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am:
cbef517d02
am:
898e330aae
* commit '
898e330aaedbfa9e41d649187800c307e3d84169':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Daniel Koulomzin [Fri, 18 Dec 2015 19:55:52 +0000 (11:55 -0800)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
am:
cbef517d02
* commit '
cbef517d02f4f3680e155cc1a704ebf5c959d03f':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Daniel Koulomzin [Fri, 18 Dec 2015 19:49:18 +0000 (19:49 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
Robert Greenwalt [Fri, 18 Dec 2015 19:42:58 +0000 (11:42 -0800)]
Robert Greenwalt [Fri, 18 Dec 2015 19:36:54 +0000 (19:36 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926 am:
3927089cce
am:
f1530bf3d7
* commit '
f1530bf3d72315256dd7a2c18ba383dc15445b54':
Protect some new broadcasts.
Bryce Lee [Fri, 18 Dec 2015 19:34:20 +0000 (11:34 -0800)]
Remove duplicate Bluetooth profiles.
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
Robert Greenwalt [Fri, 18 Dec 2015 19:31:54 +0000 (11:31 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926
am:
3927089cce
* commit '
3927089cce9d43a0b517f53fd6a542f07cb0955b':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:24:53 +0000 (11:24 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5
am:
1e04dfb926
* commit '
1e04dfb926040a6fad073fca0835777123d155e7':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:17:58 +0000 (19:17 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3
am:
81674b1ff5
* commit '
81674b1ff5deedcf2f1a79f07441e506a4f66354':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:04:25 +0000 (19:04 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798
am:
2ecc918bd3
* commit '
2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 18:48:59 +0000 (18:48 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489
am:
5946a9b798
* commit '
5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
Protect some new broadcasts.
Mark Lu [Fri, 18 Dec 2015 18:45:39 +0000 (18:45 +0000)]
Fix system watchdog timeout when reading too many usage events. am:
8877120173
am:
370567d1f5
* commit '
370567d1f5be189c858836746bd93e7482c9571a':
Fix system watchdog timeout when reading too many usage events.
Robert Greenwalt [Fri, 18 Dec 2015 18:43:05 +0000 (18:43 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f am:
a652b7161d am:
c99c41781c
am:
b5f6115092
* commit '
b5f611509276516eb26d86fe63e845b7148bec86':
Check permissions on getDeviceId.
Robert Greenwalt [Fri, 18 Dec 2015 18:41:23 +0000 (18:41 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6 am:
064eb2a7cc am:
5d7bb383b8
am:
50843b1708
* commit '
50843b1708f7662f9be661001125d91e0ef544d7':
Check permissions on getDeviceId.
Robert Greenwalt [Fri, 18 Dec 2015 18:38:10 +0000 (18:38 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
am:
5a77651489
* commit '
5a77651489ace080671034a85e5771c6ddc73525':
Protect some new broadcasts.
Daniel Koulomzin [Wed, 16 Dec 2015 22:52:25 +0000 (17:52 -0500)]
Making ViewRootImpl drop input events when the Activity is in ambient
mode.
WearableActivityController tells ViewRootImpl about ambient mode.
Bug:
25912259
Bug:
25973146
Bug:
25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
Robert Greenwalt [Fri, 18 Dec 2015 03:32:43 +0000 (19:32 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
Mark Lu [Fri, 18 Dec 2015 00:18:45 +0000 (16:18 -0800)]
Fix system watchdog timeout when reading too many usage events.
am:
8877120173
* commit '
8877120173fd62d6701822471f06fe84e992c2ae':
Fix system watchdog timeout when reading too many usage events.
Mark Lu [Fri, 6 Nov 2015 07:26:15 +0000 (15:26 +0800)]
Fix system watchdog timeout when reading too many usage events.
Symptom:
As issue link:
https://code.google.com/p/android/issues/detail?id=193100
RootCause:
UsageStatsService.onDisplayChanged executed in system main thread,
If calling UsageStatsManager.queryEvents with too many events before it
(i.e. in daily usage event file,
too many activity resume / pause events or configuration change
during monkey test),
System will be blocked then watchdog timeout.
Solution:
Let display listener executed in background thread handler
BUG:
25355086
Change-Id: Ic894d112612400ed8fb7ba843b3309fdc4f66fe1
(Cherrypicked from
4e59db328d8b0cc163d2e3eb0f7f3a108f20a58d)
(cherry picked from commit
7018f60b06fd0c647ebf13225320d7e15d02e075)
Robert Greenwalt [Thu, 17 Dec 2015 23:15:09 +0000 (15:15 -0800)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f am:
a652b7161d
am:
c99c41781c
* commit '
c99c41781c69d2cfef411c531cf879e84ca62a74':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:13:36 +0000 (15:13 -0800)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6 am:
064eb2a7cc
am:
5d7bb383b8
* commit '
5d7bb383b85aeaa60abeb6e3ad7ba854d6c40b37':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:09:11 +0000 (23:09 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f
am:
a652b7161d
* commit '
a652b7161d3069ba9b5650f1caf741d2588de141':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:07:22 +0000 (23:07 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6
am:
064eb2a7cc
* commit '
064eb2a7cc8b811671682018b82c2b63064971ef':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:04:24 +0000 (23:04 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe
am:
628b8f1f5f
* commit '
628b8f1f5f6d249e2f222602352d14c40d648d97':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:01:33 +0000 (23:01 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev
am:
ef58df63d6
* commit '
ef58df63d6ba9d56620b6a440f15d0e07c842a44':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 22:58:14 +0000 (22:58 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
am:
4557ef32fe
* commit '
4557ef32fe36b6f7ef7918052400d18af51d452f':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 22:52:58 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev
Robert Greenwalt [Thu, 17 Dec 2015 22:52:56 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
Bryce Lee [Thu, 17 Dec 2015 19:56:12 +0000 (19:56 +0000)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am:
cf91b45c05 am:
9eaa59a1ff
am:
132814f20d
* commit '
132814f20d2e0920c419042d55c8e50ace827dba':
Add setting for declaring disabled bluetooth profiles.
Bryce Lee [Thu, 17 Dec 2015 19:51:17 +0000 (19:51 +0000)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am:
cf91b45c05
am:
9eaa59a1ff
* commit '
9eaa59a1ff315bbf4d9809b30bf7777aa88e6bee':
Add setting for declaring disabled bluetooth profiles.
Bryce Lee [Thu, 17 Dec 2015 19:45:17 +0000 (11:45 -0800)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
am:
cf91b45c05
* commit '
cf91b45c05358c81ddaccf3ddd4b1ea6d5295faa':
Add setting for declaring disabled bluetooth profiles.
Bryce Lee [Thu, 17 Dec 2015 19:40:47 +0000 (19:40 +0000)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
Ying Wang [Thu, 17 Dec 2015 19:26:48 +0000 (11:26 -0800)]
Merge "Fix typo in config.xml file"
am:
738a557d54
* commit '
738a557d54153eedc74aee3dfb128f84e8ca13d4':
Fix typo in config.xml file
Ying Wang [Thu, 17 Dec 2015 19:10:13 +0000 (19:10 +0000)]
Merge "Fix typo in config.xml file"
Łukasz Nowicki [Thu, 17 Dec 2015 15:22:30 +0000 (15:22 +0000)]
Fix typo in config.xml file
Change-Id: I5902c410ced9418278e0ccf847eac8ea1d70bafe
Calin Juravle [Thu, 10 Dec 2015 17:32:15 +0000 (17:32 +0000)]
Pass app's code paths to the runtime
The runtime needs the application's main code paths so it know for which
dex files to record the profile.
Bug:
26080105
Change-Id: I5f2cb5c140aa6893ac78bc0d5897e33764569e5b
Samuel Tan [Thu, 17 Dec 2015 00:54:03 +0000 (00:54 +0000)]
Merge "Add comments to keep Java and native binder PersistableBundle in sync"
am:
6de926a7d6
* commit '
6de926a7d6439745cd0f01a69a5dd75b006b923d':
Add comments to keep Java and native binder PersistableBundle in sync
Samuel Tan [Thu, 17 Dec 2015 00:50:53 +0000 (00:50 +0000)]
Merge "Fix PersistableBundle handling in Parcel.writeValue"
am:
d12959193c
* commit '
d12959193c60254b6b03b2a60a9c6e598e9da2e5':
Fix PersistableBundle handling in Parcel.writeValue
Samuel Tan [Thu, 17 Dec 2015 00:49:19 +0000 (00:49 +0000)]
Merge "Specify path for native PersistableBundle implementation"
am:
477fa220b1
* commit '
477fa220b1766a3822171fa514983198e09daabb':
Specify path for native PersistableBundle implementation
Samuel Tan [Thu, 17 Dec 2015 00:35:58 +0000 (00:35 +0000)]
Merge "Add comments to keep Java and native binder PersistableBundle in sync"
Samuel Tan [Thu, 17 Dec 2015 00:35:43 +0000 (00:35 +0000)]
Merge "Fix PersistableBundle handling in Parcel.writeValue"
Samuel Tan [Thu, 17 Dec 2015 00:35:35 +0000 (00:35 +0000)]
Merge "Specify path for native PersistableBundle implementation"
Bryce Lee [Thu, 17 Dec 2015 00:28:04 +0000 (00:28 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am:
cae2f2415b am:
fc3762aafd
am:
0ccc3a1cb5
* commit '
0ccc3a1cb5487fb2640d749be698866475a2c435':
Add UUID to BluetoothHeadsetClientCall
Bryce Lee [Thu, 17 Dec 2015 00:20:34 +0000 (00:20 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am:
cae2f2415b
am:
fc3762aafd
* commit '
fc3762aafd58ff9eada0b5ed261de20a40d7b07a':
Add UUID to BluetoothHeadsetClientCall
Bryce Lee [Thu, 17 Dec 2015 00:09:56 +0000 (00:09 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
am:
cae2f2415b
* commit '
cae2f2415ba04eb854fdcdc6aa66c857ad7148d0':
Add UUID to BluetoothHeadsetClientCall
Bryce Lee [Thu, 17 Dec 2015 00:02:41 +0000 (00:02 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
Adam Lesinski [Wed, 16 Dec 2015 23:44:25 +0000 (23:44 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638 am:
40d1ab91d2 am:
8c9209183f am:
7f5ad22330
am:
1f7a36b8e6
* commit '
1f7a36b8e6aa55dcb22a63c250fb318260ac349f':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Adam Lesinski [Wed, 16 Dec 2015 23:35:17 +0000 (23:35 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638 am:
40d1ab91d2 am:
8c9209183f
am:
7f5ad22330
* commit '
7f5ad223306a482bdf33d213971af041e9fba590':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Bryce Lee [Wed, 16 Dec 2015 23:33:59 +0000 (15:33 -0800)]
Add UUID to BluetoothHeadsetClientCall
This will allow for unique identification of a call as id only provides
uniqueness per session.
Bug:
26016489
Change-Id: I643d24bf5ff5680c26e530075649ef2a4f378295
Adam Lesinski [Wed, 16 Dec 2015 23:25:45 +0000 (23:25 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638 am:
40d1ab91d2
am:
8c9209183f
* commit '
8c9209183fa67953bebe1adb5dfb529c1b6273f0':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Eino-Ville Talvala [Wed, 16 Dec 2015 23:20:29 +0000 (23:20 +0000)]
Merge "Revert "Camera2: create new streams if surface size has changed""
am:
79ac3edc57
* commit '
79ac3edc57f93d6b8e8187b549dd23512b841fb2':
Revert "Camera2: create new streams if surface size has changed"
Adam Lesinski [Wed, 16 Dec 2015 23:16:18 +0000 (23:16 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638
am:
40d1ab91d2
* commit '
40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Eino-Ville Talvala [Wed, 16 Dec 2015 23:09:29 +0000 (23:09 +0000)]
Merge "Camera2: create new streams if surface size has changed"
am:
bcb636d423
* commit '
bcb636d4232bedfb421ecaa157f67b96a1b26944':
Camera2: create new streams if surface size has changed
Adam Lesinski [Wed, 16 Dec 2015 23:09:27 +0000 (23:09 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
am:
b2c5155638
* commit '
b2c51556382acd3981e5a6380e2fb3d85c2f68a5':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Eino-Ville Talvala [Wed, 16 Dec 2015 23:01:43 +0000 (23:01 +0000)]
Merge "Revert "Camera2: create new streams if surface size has changed""
Yin-Chia Yeh [Wed, 16 Dec 2015 22:50:48 +0000 (22:50 +0000)]
Revert "Camera2: create new streams if surface size has changed"
This change is redundant after the following change is merged:
Camera2: Handle surface size change
When comparing if two OutputConfigurations are equal, also check
the width, height, format, dataspace when the output configurations
were created. With this, CameraDeviceImpl knows that the surface has
changed sizes and will reconfigure the stream.
Bug:
12250682
Change-Id: I4216260a0a08ad87b835ed97e9eaddf1df317fcc
This reverts commit
f49f8b0bad0c6cd5db1b603233ad008c5bac4a60.
Adam Lesinski [Wed, 2 Dec 2015 23:40:19 +0000 (15:40 -0800)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Include <uses-permission-sdk-23> permissions in dump badging and dump permissions.
This will also add implied features for that permission, marked as -sdk-23 features.
Ex:
uses-permission: name='android.permission.ACCESS_FINE_LOCATION'
uses-permission-sdk-23: name='android.permission.CAMERA'
feature-group: label=''
uses-feature: name='android.hardware.location'
uses-implied-feature: name='android.hardware.location' reason='...'
uses-feature-sdk-23: name='android.hardware.camera'
uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...'
Bug:
24939655
Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3
(cherry picked from commit
5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)
Eino-Ville Talvala [Wed, 16 Dec 2015 22:18:13 +0000 (22:18 +0000)]
Merge "Camera2: create new streams if surface size has changed"
Bryce Lee [Wed, 16 Dec 2015 21:32:28 +0000 (13:32 -0800)]
Add setting for declaring disabled bluetooth profiles.
Bug:
25900899
Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a
John Reck [Wed, 16 Dec 2015 18:44:57 +0000 (18:44 +0000)]
Merge "libhwui: make setSurface asynchronous"
am:
738a5d4f18
* commit '
738a5d4f18e69c03700b77af0ea7e2a101da2c34':
libhwui: make setSurface asynchronous
John Reck [Wed, 16 Dec 2015 18:27:24 +0000 (18:27 +0000)]
Merge "libhwui: make setSurface asynchronous"
Geoff Mendal [Wed, 16 Dec 2015 05:26:09 +0000 (05:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
d0dd157ade -s ours am:
4893042569 -s ours
am:
1d81716044 -s ours
* commit '
1d817160447901754e23c5cac841480ea8de18da':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:24:41 +0000 (05:24 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
8b4b230174 -s ours am:
82ce2a6cdb -s ours
am:
86c9eb83ce -s ours
* commit '
86c9eb83ce4cdedee531fa05647c9c4025abb293':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:18:39 +0000 (05:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
d0dd157ade -s ours
am:
4893042569 -s ours
* commit '
489304256944d6d170ab4dfd30a3e53efd994d2b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:17:12 +0000 (05:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
8b4b230174 -s ours
am:
82ce2a6cdb -s ours
* commit '
82ce2a6cdbf0eedfca0ef3f2716a09e10d159202':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:13:21 +0000 (21:13 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
10bc1c7000 -s ours am:
c8ddc96f01 -s ours
am:
5b1b0a8224 -s ours
* commit '
5b1b0a82241d9b9fa033d5d03c0e49d729cd0958':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:11:07 +0000 (05:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
d0dd157ade -s ours
* commit '
d0dd157ade7536286e32ecbb271d3561bd7b5e93':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:09:37 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
8b4b230174 -s ours
* commit '
8b4b230174228fd6313ae493a44cc7dc67c6bfc4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:05:55 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
10bc1c7000 -s ours
am:
c8ddc96f01 -s ours
* commit '
c8ddc96f01b52b4aab1741fc033076dd46b076f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:05:18 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 05:03:50 +0000 (21:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia8ab8097f7b82ed5fb344351035535c5b3b0690d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 05:03:46 +0000 (05:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
df5dd062a0 -s ours am:
a32b362f00 -s ours
am:
4cab51620b -s ours
* commit '
4cab51620b7a580e7a54599c03d4b88e8f868553':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:02:26 +0000 (05:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 05:02:15 +0000 (05:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
531eb5b484 -s ours am:
57a89670cb -s ours
am:
b16da9aef2 -s ours
* commit '
b16da9aef296f0b762e1934e505bb89a7f715f0b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:00:49 +0000 (21:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifbe7e97f2a1fe1b688642a8179c0e184d69ba3cb
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:58:38 +0000 (04:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
10bc1c7000 -s ours
* commit '
10bc1c7000e1c9d232a1074e8788ed75ee4c2117':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:54:40 +0000 (20:54 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
327d917865 -s ours am:
7babe8de9e -s ours
am:
0750798334 -s ours
* commit '
07507983347a3b0ff9cdd60eb408839e1ed4895f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:54:38 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
df5dd062a0 -s ours
am:
a32b362f00 -s ours
* commit '
a32b362f00338421789679dcb5ddd3bd3c2c6711':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:53:02 +0000 (20:53 -0800)]
Import translations. DO NOT MERGE am:
22dea4e16f -s ours am:
d8004c03d2 -s ours
am:
b295f8112c -s ours
* commit '
b295f8112c82efc1d9d162855dbcbde32ddb839d':
Import translations. DO NOT MERGE
OSDN Git Service
