OSDN Git Service
Svet Ganov [Mon, 11 Jan 2016 18:19:08 +0000 (18:19 +0000)]
am
6a67cd45: am
ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev
am:
a938239f33
* commit '
a938239f33f2fc615cb8e1813eb6a9773ff16c96':
Svetoslav [Mon, 11 Jan 2016 18:16:09 +0000 (18:16 +0000)]
am
0f74977b: am
e9fc4cda: Merge "Add camera app op - framework" into mnc-dev
am:
4e71319952
* commit '
4e713199526b1ddc8c8a1a518eff0d19e44a145d':
Mike Lockwood [Mon, 11 Jan 2016 18:13:06 +0000 (18:13 +0000)]
am
32624f29: am
5ba44aff: Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev
am:
37ba571347
* commit '
37ba57134777a82227e3e12a958111d7f37beb48':
Geoff Mendal [Mon, 11 Jan 2016 18:09:31 +0000 (18:09 +0000)]
am
e647500f: (-s ours) am
9eb25fad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
am:
b38f599221 -s ours
* commit '
b38f599221e1bc56ca9bb9f510f7f8ec4495e1d2':
Geoff Mendal [Mon, 11 Jan 2016 18:06:29 +0000 (18:06 +0000)]
am
44acc73e: (-s ours) am
6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
am:
d6a9daa65e -s ours
* commit '
d6a9daa65e9237914f8877fd6d9a6965e1e39147':
Lajos Molnar [Mon, 11 Jan 2016 18:03:08 +0000 (18:03 +0000)]
am
6a667c6f: am
4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev
am:
fe96c1891e
* commit '
fe96c1891e42a408247ff6bf8827b3c8ffb68f83':
Chong Zhang [Mon, 11 Jan 2016 18:00:05 +0000 (18:00 +0000)]
am
a77578d3: am
039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev
am:
4d3a3429d2
* commit '
4d3a3429d2dced2a93fa02054fb34d2107e0364a':
Chong Zhang [Mon, 11 Jan 2016 17:55:55 +0000 (17:55 +0000)]
am
1228e72b: am
03359161: MediaRecorder: implement persistent input surface APIs
am:
970be8a6eb
* commit '
970be8a6eb3f1b35dee85fb26b8a49976795bfb6':
Chong Zhang [Mon, 11 Jan 2016 17:52:55 +0000 (17:52 +0000)]
am
2cfcaf48: am
1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev
am:
0e3758333d
* commit '
0e3758333de98de24b8cbb2f05fc1b53e182aa9e':
Chris Tate [Mon, 11 Jan 2016 17:50:56 +0000 (17:50 +0000)]
am
a51f14d0: Merge "Fix NPE in JobServiceContext when closing job."
am:
20fb8187c4
* commit '
20fb8187c41cf0fd926620b9734b9211ce0c8306':
Fix NPE in JobServiceContext when closing job.
Bryce Lee [Mon, 11 Jan 2016 17:48:10 +0000 (17:48 +0000)]
am
176987b7: am
13428b50: am
f626c679: am
a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev
am:
520b550564
* commit '
520b550564d9a640de655e10995a4007e836c1fa':
Rich Slogar [Mon, 11 Jan 2016 17:45:52 +0000 (17:45 +0000)]
am
1705b2fd: am
c2180dd5: am
31e49327: am
4e3a9193: am
7e42a822: am
a00cf127: am
3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs
am:
40d0be81b7
* commit '
40d0be81b720774bb05330952cfdb2d64c371a35':
Rich Slogar [Mon, 11 Jan 2016 17:39:25 +0000 (17:39 +0000)]
am
3daee8a7: am
d8417f12: am
906c4f27: am
f7ef3edb: am
3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs
am:
e36725b358
* commit '
e36725b3581022795562096789bc8f1d4d5c10ba':
Raph Levien [Mon, 11 Jan 2016 17:37:06 +0000 (17:37 +0000)]
am
741d6120: am
5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev
am:
86de59aa33
* commit '
86de59aa33e109f237e9fc25a2bcf779dc753f0c':
Raph Levien [Mon, 11 Jan 2016 17:34:24 +0000 (17:34 +0000)]
am
96a9c9b5: am
4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev
am:
151ccb9f58
* commit '
151ccb9f580e0082c571e50e4817ccd1cdd4379d':
Yohei Yukawa [Mon, 11 Jan 2016 17:32:00 +0000 (17:32 +0000)]
am
14a60950: am
b6bec1a4: Remove unused methods/variables/fields from Editor.java.
am:
f436e6e848
* commit '
f436e6e8483145d25608b775c1088da4bcdea066':
Svet Ganov [Mon, 11 Jan 2016 17:30:01 +0000 (17:30 +0000)]
am
17daa3d0: am
574f5379: Merge "Add body sensors app op - framework base" into mnc-dev
am:
107cd552f1
* commit '
107cd552f1d88ae22fde0284f4a64f78eaadfbc1':
Chris Craik [Mon, 11 Jan 2016 17:27:51 +0000 (17:27 +0000)]
am
378510c3: am
106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev
am:
6e51a707ea
* commit '
6e51a707ea986102fb507bfdf00d2a4dddee70f7':
Fabrice Di Meglio [Mon, 11 Jan 2016 17:25:39 +0000 (17:25 +0000)]
am
6ae03f34: am
4eb03f8f: Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev
am:
f157249b63
* commit '
f157249b63ea77d568856cfc4961156ae23f236c':
Chris Craik [Mon, 11 Jan 2016 17:23:16 +0000 (17:23 +0000)]
Chris Craik [Mon, 11 Jan 2016 17:17:59 +0000 (17:17 +0000)]
am
2551857f: am
f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
am:
e920b1459a
* commit '
e920b1459a0ecd4240df78a616b56c0230446c5c':
Chris Craik [Mon, 11 Jan 2016 17:14:52 +0000 (17:14 +0000)]
am
3059dbb6: am
04c0f415: Merge "Update alpha documentation" into mnc-dev
am:
ed8623690b
* commit '
ed8623690b710ccb601373a622b09d96d7d15904':
Jorim Jaggi [Mon, 11 Jan 2016 17:08:29 +0000 (17:08 +0000)]
am
3f5f1cb6: am
0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev
am:
83fb90f61f
* commit '
83fb90f61fa24ba7cc2b69ce91ad03b95d9d6024':
Mathieu Chartier [Mon, 11 Jan 2016 17:06:03 +0000 (17:06 +0000)]
am
5cc626bb: Merge "Look at map extensions before /dev/ + ashmem."
am:
eec5a4e7a4
* commit '
eec5a4e7a4b21fa1e109918a6b97c33c22a5d124':
Look at map extensions before /dev/ + ashmem.
Mathieu Chartier [Mon, 11 Jan 2016 17:04:01 +0000 (17:04 +0000)]
am
4c7518e1: am
9a4cdf5c: Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev
am:
292ef72cc4
* commit '
292ef72cc46c21d7f1a5e7fe63960e1662d2d2d7':
Chris Wren [Mon, 11 Jan 2016 17:01:44 +0000 (17:01 +0000)]
am
f114e3d9: am
b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev
am:
c04a5df9c5
* commit '
c04a5df9c52fe026f1d0188eb092f12d0ad62505':
Alan Viverette [Mon, 11 Jan 2016 16:58:45 +0000 (16:58 +0000)]
am
aeedef55: am
da0d6a6b: Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev
am:
f71c93ff9a
* commit '
f71c93ff9aefade3bb0f9a056f88a38f6cf737c3':
Ruben Brunk [Mon, 11 Jan 2016 16:56:04 +0000 (16:56 +0000)]
am
626cd0fb: am
0f2be13d: camera: Update Camera2 API for arbitration.
am:
128a2fa002
* commit '
128a2fa0021d2ef0bc1d1932cbbd877c69465c74':
Fabrice Di Meglio [Mon, 11 Jan 2016 16:52:54 +0000 (16:52 +0000)]
am
359b96e5: am
83bb765b: Merge "Add IntentFilter auto verification - part 7" into mnc-dev
am:
620649263f
* commit '
620649263fc9e8e3d782dba49bd46d5ae199c636':
Andrew Lee [Mon, 11 Jan 2016 16:49:57 +0000 (16:49 +0000)]
am
da5e8ba0: am
f3280041: Merge "Add Properties to Call.Details." into mnc-dev
am:
72f95561f1
* commit '
72f95561f1094525ad5f42d174d78dc36a21baf1':
Yohei Yukawa [Mon, 11 Jan 2016 16:44:20 +0000 (16:44 +0000)]
am
71cbadf3: am
097d5f10: Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev
am:
784480b62c
* commit '
784480b62cbcbd86c48da8191af66755211d3f4f':
Amith Yamasani [Mon, 11 Jan 2016 16:40:45 +0000 (16:40 +0000)]
am
17d5e266: am
92d42057: Merge "Exclude bound app widgets from idle app list" into mnc-dev
am:
bd898e707b
* commit '
bd898e707b724a6f2e339a6231aa531670bdf5e6':
Dan Sandler [Mon, 11 Jan 2016 16:38:20 +0000 (16:38 +0000)]
am
548f4d6c: am
9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev
am:
a89899a324
* commit '
a89899a3241008679cf1c37651ea8bf9adc65ecd':
Benjamin Franz [Mon, 11 Jan 2016 16:35:06 +0000 (16:35 +0000)]
am
cecb3621: am
a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev
am:
48bb01e1ef
* commit '
48bb01e1ef74a8e3e7595ba880bb5072b3d1a23b':
Doris Liu [Mon, 11 Jan 2016 16:32:57 +0000 (16:32 +0000)]
am
3ebbc50c: am
27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev
am:
b343db76aa
* commit '
b343db76aa8623a0253746f70beb5543c3ae5473':
Roozbeh Pournader [Mon, 11 Jan 2016 16:31:02 +0000 (16:31 +0000)]
am
33d1c27e: am
087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev
am:
20a862ba14
* commit '
20a862ba1474ac994c2ed35daf094910c0215ff3':
Amit Mahajan [Mon, 11 Jan 2016 16:29:02 +0000 (16:29 +0000)]
Jeff Sharkey [Mon, 11 Jan 2016 16:26:46 +0000 (16:26 +0000)]
am
3b342179: am
a320505f: Merge "Move both app code and data together." into mnc-dev
am:
399199fe82
* commit '
399199fe8239c11f902265b03f90dc8194e59a53':
John Reck [Mon, 11 Jan 2016 16:24:27 +0000 (16:24 +0000)]
am
7e22cc99: am
78760b4a: Merge "A bunch more cleanups" into mnc-dev
am:
1ad0936c77
* commit '
1ad0936c77d3c742970e7051c62c715a00c082ca':
Geoff Mendal [Mon, 21 Dec 2015 13:13:55 +0000 (05:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8469dc7993a2ff864d81cb7a5b2e743e5c1e0220
Auto-generated-cl: translation import
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.
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.
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: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
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: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
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
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
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)
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
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: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:02:26 +0000 (05:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
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: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:01 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
531eb5b484 -s ours
am:
57a89670cb -s ours
* commit '
57a89670cbe157cf8a99a6a0f0a10b37aac2b8ee':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:49:00 +0000 (04:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:45:33 +0000 (20:45 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
327d917865 -s ours
am:
7babe8de9e -s ours
* commit '
7babe8de9eb51c5c23c9d3257314aa374112d550':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:45:33 +0000 (20:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idc7e685457dc0bc2da4df2bd10ac2187d64fa00f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:45:32 +0000 (04:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
df5dd062a0 -s ours
* commit '
df5dd062a0016ff66239e4507da07a90a83063dc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:43:18 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
531eb5b484 -s ours
* commit '
531eb5b484765888aa0dd969645593b50144c201':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:43:18 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE am:
22dea4e16f -s ours
am:
d8004c03d2 -s ours
* commit '
d8004c03d2c05d84e38ce3a5da88fd4b2c4e9681':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:36:13 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:35:34 +0000 (20:35 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
327d917865 -s ours
* commit '
327d917865331d1b6823495e1e4ba43930caaacb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:34:53 +0000 (20:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic3c47d16450ddb80c815369cf01bb63be1f73a88
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:34:26 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:33:27 +0000 (20:33 -0800)]
Import translations. DO NOT MERGE
am:
22dea4e16f -s ours
* commit '
22dea4e16f9a32eb4693829b59462c32dda3f45c':
Import translations. DO NOT MERGE
OSDN Git Service
