OSDN Git Service
Adam Lesinski [Thu, 22 Sep 2016 04:55:17 +0000 (04:55 +0000)]
Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev
am:
8dcd08ed04
Change-Id: I78f9e151ec1705b65f6ed512973c63dcd826fec2
Adam Lesinski [Thu, 22 Sep 2016 04:55:13 +0000 (04:55 +0000)]
AAPT: Don't imply specific location hardware for dump badging
am:
43158773b4
Change-Id: Ie34566a33dfbaf92f4a47f36be6786157d504066
Andrii Kulian [Thu, 22 Sep 2016 03:54:13 +0000 (03:54 +0000)]
Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev
am:
3904e1bc34
Change-Id: I3de16803747f58fba71d6e33ea934eb309d2310b
Andrii Kulian [Thu, 22 Sep 2016 03:54:10 +0000 (03:54 +0000)]
Fix stopping activity when removed from waiting visible
am:
ee05681139
Change-Id: Iefa95af94e488fbd33c567e268ab7fb7a1e09f51
Adam Powell [Thu, 22 Sep 2016 03:52:39 +0000 (03:52 +0000)]
Merge "Don't hold old host callback for fragments on the back stack" into nyc-mr1-dev
am:
33c9713bdd
Change-Id: I5b567de888a3f0ff359a1cbe7664dcced217fa62
Adam Powell [Thu, 22 Sep 2016 03:52:35 +0000 (03:52 +0000)]
Don't hold old host callback for fragments on the back stack
am:
180202f221
Change-Id: I7f2c4c8d340b1b54d3e9ded5819e19fa3e4bc83e
Jeff Sharkey [Thu, 22 Sep 2016 03:51:22 +0000 (03:51 +0000)]
Merge "Rename should behave like create: avoid conflict." into nyc-mr1-dev
am:
b90ae85acc
Change-Id: I7d6c0180ddcd9224a7e738351c7c7854f6c5068d
Jeff Sharkey [Thu, 22 Sep 2016 03:51:19 +0000 (03:51 +0000)]
Rename should behave like create: avoid conflict.
am:
2c89a4c170
Change-Id: I8d288a8afd06bc46d8d3051ce025c0af6c9875fa
Edward Savage-Jones [Thu, 22 Sep 2016 03:50:15 +0000 (03:50 +0000)]
Merge "Fix WallpaperManager APIs" into nyc-mr1-dev
am:
7baf677ded
Change-Id: I0bfa8d50d88b09316c6efe8d8db16686ce0d300d
Edward Savage-Jones [Thu, 22 Sep 2016 03:50:04 +0000 (03:50 +0000)]
Fix WallpaperManager APIs
am:
6009d9db88
Change-Id: I82de1e6403306f0984d15db8448546aebf7ec107
Selim Cinek [Thu, 22 Sep 2016 03:48:38 +0000 (03:48 +0000)]
Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev
am:
4c1c7f3e18
Change-Id: I74fe8ee556cf39459e61876dccab10140e3afe04
Selim Cinek [Thu, 22 Sep 2016 03:48:34 +0000 (03:48 +0000)]
Large icons now scale nicer when expanding bundles
am:
8a71ad032f
Change-Id: I391f56cca21177179ea033d7be08f649e7b61664
TreeHugger Robot [Thu, 22 Sep 2016 02:32:55 +0000 (02:32 +0000)]
Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 02:00:59 +0000 (02:00 +0000)]
Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev
Adam Lesinski [Wed, 11 Nov 2015 23:13:55 +0000 (15:13 -0800)]
AAPT: Don't imply specific location hardware for dump badging
Permissions such as android.permission.ACCESS_FINE_LOCATION
and android.permission.ACCESS_COARSE_LOCATION assumed the underlying feature
technology and aapt dump badging would emit an implied feature.
This is no longer accurate, so the only implied feature is on the general
android.hardware.location when the target SDK of the app is 21+.
Bug:
25218770
Change-Id: Ica9ebf7d4f360b137af54a8c8fd6c0358cd9be6a
TreeHugger Robot [Thu, 22 Sep 2016 00:49:58 +0000 (00:49 +0000)]
Merge "Don't hold old host callback for fragments on the back stack" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 00:49:05 +0000 (00:49 +0000)]
Merge "Rename should behave like create: avoid conflict." into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 00:35:10 +0000 (00:35 +0000)]
Merge "Fix WallpaperManager APIs" into nyc-mr1-dev
Andrii Kulian [Wed, 21 Sep 2016 22:34:45 +0000 (15:34 -0700)]
Fix stopping activity when removed from waiting visible
During refactoring in ag/613666 waitingVisible flag clearing
was mistakenly removed. It was added back in ag/
1221328 but
only for activities that are finishing.
This caused activity not being stopped in some cases when
window visibility change was handled before receiving idle
callback from client. This is easily reproducible when there
is a scene transition animation specified.
Bug:
31078584
Change-Id: Ic09c5199ad4fceae0607e4bcce02be5335c8870b
Selim Cinek [Wed, 21 Sep 2016 23:51:02 +0000 (23:51 +0000)]
Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev
Ben Lin [Wed, 21 Sep 2016 23:42:11 +0000 (23:42 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev
am:
ba0ee69a15 -s ours
Change-Id: I9fbfd898747aa183b91df605d85d91c797992ba3
Ben Lin [Wed, 21 Sep 2016 23:42:08 +0000 (23:42 +0000)]
DO NOT MERGE ANYWHERE
am:
5e1e779098 -s ours
Change-Id: I3a51fc93e7b754d7a5697ba2ef19c38b9af0e42c
Jeff Sharkey [Wed, 21 Sep 2016 00:54:46 +0000 (18:54 -0600)]
Rename should behave like create: avoid conflict.
When we create a file that already exists, we try attaching a suffix
like "(1)" to the filename to avoid the conflict. The newly added
rename method should do the same, since developers may not have
access to delete the conflicting file.
Test: boots, rename via UI, new unit tests
Bug:
31545404
Change-Id: Ie397eebb0fbf98cf079eee3bbbb6c6b7ca627d91
Adam Powell [Wed, 21 Sep 2016 22:41:47 +0000 (15:41 -0700)]
Don't hold old host callback for fragments on the back stack
LoaderManagers configure their host callback lazily as their
associated fragment is brought up through its lifecycle states. In the
case of fragments on the fragment back stack this could happen very
late, if at all. As a LoaderManager's host callback references the
host Activity, this means that a LoaderManager could keep a destroyed
Activity reference alive.
Update the host callbacks of all LoaderManagers eagerly during the
restore non-configuration instance phase.
Bug:
30653222
Test: core/tests/coretests/src/android/app/LoaderLifecycleTest.java
Change-Id: I5d2b81daae5e7cae429fcf4934e64b3ce281140c
Ben Lin [Wed, 21 Sep 2016 22:34:52 +0000 (22:34 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev
Edward Savage-Jones [Tue, 30 Aug 2016 16:44:19 +0000 (18:44 +0200)]
Fix WallpaperManager APIs
When support for lockscreen wallpapers was added in API level 24 the
behaviour for earlier API versions changed. Calls to the old 'set' APIs
no longer affect the overall device wallpaper, and can result in an end
user not being able to change their lockscreen wallpaper.
This upload restores the original API behaviour.
Bug:
31204228
Bug:
30456015
Change-Id: Ia16d2e2e379c54d798eef8f5c653099c2c581d78
Amith Yamasani [Wed, 21 Sep 2016 21:58:17 +0000 (21:58 +0000)]
Merge "Don't inform usage stats of interaction for a toast" into nyc-mr1-dev
am:
be2db1ef72
Change-Id: I569b016f00e3e11ab5996392119afcc55e385a57
Amith Yamasani [Wed, 21 Sep 2016 21:57:54 +0000 (21:57 +0000)]
Don't inform usage stats of interaction for a toast
am:
43caafa2b6
Change-Id: I7b1c81eef73870b115be65dae2e2bd9094333dff
Amith Yamasani [Wed, 21 Sep 2016 21:38:18 +0000 (21:38 +0000)]
Merge "Don't inform usage stats of interaction for a toast" into nyc-mr1-dev
Tyler Gunn [Wed, 21 Sep 2016 20:03:24 +0000 (20:03 +0000)]
Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev
am:
103922f8c6
Change-Id: Ib67ba89902ebcdb8c8f0a9202e937a2e8ace4aa2
Tyler Gunn [Wed, 21 Sep 2016 20:03:22 +0000 (20:03 +0000)]
Fix potential NPE in RemoteConnection.
am:
9c2c583ad7
Change-Id: I12d99b4c374da49c051285db3c5b1a4652db6241
Tyler Gunn [Wed, 21 Sep 2016 19:56:47 +0000 (19:56 +0000)]
Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev
Amith Yamasani [Tue, 20 Sep 2016 23:06:22 +0000 (16:06 -0700)]
Don't inform usage stats of interaction for a toast
If the process is forced to the foreground due to a toast,
don't inform usage stats of an interaction. Otherwise app standby
will be defeated easily.
Bug:
31544592
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdle_toast
Change-Id: I100d839ef8cf361704fd5db4b26dcc878672a235
Fan Zhang [Wed, 21 Sep 2016 16:27:53 +0000 (16:27 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am:
32bd448cc1 am:
9c4561370d
am:
9096780031
Change-Id: Iddb1191aa59d0466754de8d6f12f9b31e7138985
Fan Zhang [Wed, 21 Sep 2016 16:26:53 +0000 (16:26 +0000)]
Fix NPE for WifiConfiguration in AccessPoint. am:
51365c3b4c am:
05df69d52a
am:
20370bb9b1
Change-Id: I179d99b1025f41387f561745991683ad99034630
Fan Zhang [Wed, 21 Sep 2016 16:05:28 +0000 (16:05 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am:
32bd448cc1
am:
9c4561370d
Change-Id: I77194b8ef5f71f36020cf02c010d47dd07c12a93
Fan Zhang [Wed, 21 Sep 2016 15:57:12 +0000 (15:57 +0000)]
Fix NPE for WifiConfiguration in AccessPoint. am:
51365c3b4c
am:
05df69d52a
Change-Id: I963115016cae383f47e4dfbb262200b945fd3b0d
Fan Zhang [Wed, 21 Sep 2016 15:38:12 +0000 (15:38 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
am:
32bd448cc1
Change-Id: I11d2bdcbd0635510ae7a53574749404a96162773
Fan Zhang [Wed, 21 Sep 2016 15:38:08 +0000 (15:38 +0000)]
Fix NPE for WifiConfiguration in AccessPoint.
am:
51365c3b4c
Change-Id: I7d653816e70f38f0cce3a6bc8f0eaade8593866a
Fan Zhang [Wed, 21 Sep 2016 15:29:56 +0000 (15:29 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
Lorenzo Colitti [Wed, 21 Sep 2016 09:53:25 +0000 (09:53 +0000)]
Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev am:
4813790d95
am:
488ca21f0a
Change-Id: I5284a99c478a77187ce0e115b07248d89e6886a6
Lorenzo Colitti [Wed, 21 Sep 2016 09:52:30 +0000 (09:52 +0000)]
Rematch wifi networks when the avoid bad wifi setting changes. am:
836d8788a8
am:
caf1f0bf0e
Change-Id: I6d5fca7707fdc26c953df626c7eddc3f108b949c
Lorenzo Colitti [Wed, 21 Sep 2016 09:47:33 +0000 (09:47 +0000)]
Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev
am:
4813790d95
Change-Id: I1cacc2f888f429932b6506c9e9d216f2a502e354
Lorenzo Colitti [Wed, 21 Sep 2016 09:47:28 +0000 (09:47 +0000)]
Rematch wifi networks when the avoid bad wifi setting changes.
am:
836d8788a8
Change-Id: I589cfdb8792997fe94d22c551c8a53e48e45db1a
Lorenzo Colitti [Wed, 21 Sep 2016 09:42:05 +0000 (09:42 +0000)]
Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev
Ajay Panicker [Wed, 21 Sep 2016 06:35:05 +0000 (06:35 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac am:
be2651bb6b am:
a7176293fd am:
e60aa74d44 -s ours am:
e053061edd am:
6ac86ae1db
am:
9030016e5f
Change-Id: I795156bf2fba87dc1969ac60c2fc0225165d8c90
Lorenzo Colitti [Wed, 21 Sep 2016 05:22:33 +0000 (14:22 +0900)]
Rematch wifi networks when the avoid bad wifi setting changes.
Currently, when the avoid bad wifi setting changes, we rematch
all networks and requests, but do not update any NetworkFactories
with new scores. This means that if a wifi network's score goes
down as a result of enabling bad wifi avoidance, we will not look
for another network (e.g., cell data) to satisfy its requests.
This makes it so that when the user enables avoiding bad wifi,
we will attempt to bring up cell data will if it is not already
connected.
Bug:
31075769
Change-Id: Ie5b685be8676999adea8c9ecbbc1abb92f81a74f
Ajay Panicker [Wed, 21 Sep 2016 06:04:40 +0000 (06:04 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975 am:
dddb99f020 am:
cdf3126615 am:
bd752f7d88 -s ours am:
da12b4b0f0 am:
71831be462
am:
89024c7477
Change-Id: I0c48d8983c1b35f406e9fbe15dcc3b8f650bef5f
Ajay Panicker [Wed, 21 Sep 2016 06:03:44 +0000 (06:03 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1 am:
3ed9e7693d am:
853e39d3d9 am:
232824e01c -s ours am:
257cf16de3 am:
c96f655395
am:
4a496b0810
Change-Id: I3386d471bc4c242fb769e1f20ff7755281434ed3
Ajay Panicker [Wed, 21 Sep 2016 05:43:52 +0000 (05:43 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac am:
be2651bb6b am:
a7176293fd am:
e60aa74d44 -s ours am:
e053061edd
am:
6ac86ae1db
Change-Id: I3d6994fffb88ca8ba49cb3efa321493661ab33d2
Ajay Panicker [Wed, 21 Sep 2016 05:41:26 +0000 (05:41 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975 am:
dddb99f020 am:
cdf3126615 am:
bd752f7d88 -s ours am:
da12b4b0f0
am:
71831be462
Change-Id: I83dc1f6eee420b9aa655f32e70f5a5c618bd552d
Ajay Panicker [Wed, 21 Sep 2016 05:40:01 +0000 (05:40 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1 am:
3ed9e7693d am:
853e39d3d9 am:
232824e01c -s ours am:
257cf16de3
am:
c96f655395
Change-Id: I844fa87398b64854c7655d43339887ea2a7a56ee
Ajay Panicker [Wed, 21 Sep 2016 05:25:30 +0000 (05:25 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77 am:
1682f67177 am:
13ac17ab3a am:
ec220f645f -s ours am:
e460ea15e6 am:
b9cfbef8db
am:
7b11b2deff
Change-Id: Icf0963c53b5684f19a01f72608d8cf83756f32d4
Ajay Panicker [Wed, 21 Sep 2016 05:23:32 +0000 (05:23 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa am:
b2e8361c50 am:
c147db7a79 am:
3e238e3396 -s ours am:
998001b4b2 am:
d9421e7758
am:
48f906c852
Change-Id: I098c0cdb31cf4ca5da368d57cdf67089fe8a0cf8
Ajay Panicker [Wed, 21 Sep 2016 05:21:16 +0000 (05:21 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e am:
d46605ab09 am:
fc7822f58a am:
93a622150f -s ours am:
834f982c97 am:
51c046dae8
am:
a33da80306
Change-Id: I930c52f0167d227766206a6e32712c214ed7855d
Ajay Panicker [Wed, 21 Sep 2016 05:06:53 +0000 (05:06 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac am:
be2651bb6b am:
a7176293fd am:
e60aa74d44 -s ours
am:
e053061edd
Change-Id: I3b271244a7be75f7f652f8192ba337352d946462
Ajay Panicker [Wed, 21 Sep 2016 04:16:27 +0000 (04:16 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77 am:
1682f67177 am:
13ac17ab3a am:
ec220f645f -s ours am:
e460ea15e6
am:
b9cfbef8db
Change-Id: I5cd4c1be5362d2d0500afa29ffddc20a541e6ee5
Ajay Panicker [Wed, 21 Sep 2016 04:14:28 +0000 (04:14 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975 am:
dddb99f020 am:
cdf3126615 am:
bd752f7d88 -s ours
am:
da12b4b0f0
Change-Id: I9cf2a8223db41299b5c4089437a0ff3cc14418e4
Ajay Panicker [Wed, 21 Sep 2016 04:14:26 +0000 (04:14 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa am:
b2e8361c50 am:
c147db7a79 am:
3e238e3396 -s ours am:
998001b4b2
am:
d9421e7758
Change-Id: Ifd0e426285b9242ed9b0a1c3f72d82bad8fc9e02
Elliot Waite [Wed, 21 Sep 2016 04:14:16 +0000 (04:14 +0000)]
Merge "Fix some at links." into nyc-dev am:
edc31f9593 am:
7072b952c8
am:
00be401c1d
Change-Id: I3221f5ac3e141cdb8379c41ebc64b6d10ff4bc19
Ajay Panicker [Wed, 21 Sep 2016 04:13:46 +0000 (04:13 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac am:
be2651bb6b am:
a7176293fd
am:
e60aa74d44 -s ours
Change-Id: Id0fe233f9b700c7b41fe864699b54727108b6ecf
Ajay Panicker [Wed, 21 Sep 2016 04:13:25 +0000 (04:13 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1 am:
3ed9e7693d am:
853e39d3d9 am:
232824e01c -s ours
am:
257cf16de3
Change-Id: I1677fdf4dcfe9fe96de22f4cdfb67225b4d86a2e
Elliot Waite [Wed, 21 Sep 2016 04:13:16 +0000 (04:13 +0000)]
Fix some at links. am:
28d87163e1 am:
f3bbfdaf9d
am:
5c8bd2598d
Change-Id: I2fa802d2e0db99ca0abe2cb3f3ac98c0b5aa9bb5
Ajay Panicker [Wed, 21 Sep 2016 04:12:11 +0000 (04:12 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e am:
d46605ab09 am:
fc7822f58a am:
93a622150f -s ours am:
834f982c97
am:
51c046dae8
Change-Id: I2c10dde1ac9c511ed21d7a7b2e97d1f7de4d9d0e
Ajay Panicker [Wed, 21 Sep 2016 04:02:02 +0000 (04:02 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac am:
be2651bb6b
am:
a7176293fd
Change-Id: I480a3e8cfc363570ecb10d5cca2b0e1a95472f51
Ajay Panicker [Wed, 21 Sep 2016 03:44:15 +0000 (03:44 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac
am:
be2651bb6b
Change-Id: I7ffc9b61fbfe670a68049b94a05415abec38e36e
Ajay Panicker [Wed, 21 Sep 2016 03:30:43 +0000 (03:30 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77 am:
1682f67177 am:
13ac17ab3a am:
ec220f645f -s ours
am:
e460ea15e6
Change-Id: I37c93b23735ea728ce5cfd77ae930f6834a6cfe5
Ajay Panicker [Wed, 21 Sep 2016 03:27:48 +0000 (03:27 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa am:
b2e8361c50 am:
c147db7a79 am:
3e238e3396 -s ours
am:
998001b4b2
Change-Id: I3fa54c60c1172c2e934fa8887413c3767f82e6d6
Ajay Panicker [Wed, 21 Sep 2016 03:26:15 +0000 (03:26 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975 am:
dddb99f020 am:
cdf3126615
am:
bd752f7d88 -s ours
Change-Id: I5657111479e2ac6df3f856c7a624421e37ec731d
Ajay Panicker [Wed, 21 Sep 2016 03:25:07 +0000 (03:25 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e am:
d46605ab09 am:
fc7822f58a am:
93a622150f -s ours
am:
834f982c97
Change-Id: I01516b02b44a32a1f140143ef118f623905fca1e
Ajay Panicker [Wed, 21 Sep 2016 03:23:38 +0000 (03:23 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours
am:
3a20f7ceac
Change-Id: I10c29e499b19e247dedc4e65b3d1d4bd42a7eb03
Ajay Panicker [Wed, 21 Sep 2016 03:17:36 +0000 (03:17 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1 am:
3ed9e7693d am:
853e39d3d9
am:
232824e01c -s ours
Change-Id: Ic4636b08ecc94720c7b013769436668167b6fca8
Ajay Panicker [Wed, 21 Sep 2016 03:15:14 +0000 (03:15 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77 am:
1682f67177 am:
13ac17ab3a
am:
ec220f645f -s ours
Change-Id: If90aff1167803a965e938f9e174ec1df09401b85
Ajay Panicker [Wed, 21 Sep 2016 03:13:20 +0000 (03:13 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa am:
b2e8361c50 am:
c147db7a79
am:
3e238e3396 -s ours
Change-Id: I52e1cfccc31b8169eaeb4e4aacc67b97b0e39cec
Elliot Waite [Wed, 21 Sep 2016 03:12:54 +0000 (03:12 +0000)]
Merge "Fix some at links." into nyc-dev am:
edc31f9593
am:
7072b952c8
Change-Id: I379a5a75cc2fc85a1520ea45b3e1cbd0674ad199
Ajay Panicker [Wed, 21 Sep 2016 03:12:09 +0000 (03:12 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975 am:
dddb99f020
am:
cdf3126615
Change-Id: I37fdf0eb48bd07dc07b8716040d2f286304bce70
Ajay Panicker [Wed, 21 Sep 2016 03:12:02 +0000 (03:12 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e am:
d46605ab09 am:
fc7822f58a
am:
93a622150f -s ours
Change-Id: If89cb759ef536ee618a3ab6121fde4e3dbc6dac3
Elliot Waite [Wed, 21 Sep 2016 03:11:58 +0000 (03:11 +0000)]
Fix some at links. am:
28d87163e1
am:
f3bbfdaf9d
Change-Id: I6f0e9b8702c4a09bbe3c752077a8d9e164c61d2e
Ajay Panicker [Wed, 21 Sep 2016 03:10:15 +0000 (03:10 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5
am:
fe616288dc -s ours
Change-Id: I858b0c0f7d1b9e723857169bd7f29a55d82e0136
Felipe Leme [Wed, 21 Sep 2016 03:09:16 +0000 (03:09 +0000)]
Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev
am:
1bae4e3e17
Change-Id: I7e0677a20b59ef8449ec2318292cf7afff7c5115
Felipe Leme [Wed, 21 Sep 2016 03:09:13 +0000 (03:09 +0000)]
Listen to ACTION_UID_REMOVED only. DO NOT MERGE.
am:
f1da90fe04
Change-Id: I6a555cc1572add73e467a829271909aade5ca1e3
Marie Janssen [Wed, 21 Sep 2016 02:57:35 +0000 (02:57 +0000)]
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am:
22046e7323 am:
e4f60787f3 am:
ce8032ebbb am:
0ed17e5c8d am:
9013d67f0c am:
7e5b9e3d32
am:
32ae78598d
Change-Id: I8125e8c8d043d1b9a7e41ce4aaa829dd0427ca23
Ajay Panicker [Wed, 21 Sep 2016 02:56:53 +0000 (02:56 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975
am:
dddb99f020
Change-Id: Ie45bd66830e6e3e68be7e3f2692911ea4fa82fa9
Marie Janssen [Wed, 21 Sep 2016 02:56:01 +0000 (02:56 +0000)]
Fix setPairingConfirmation permissions issue (2/2) am:
93326cfd9f am:
3106e3ae27 am:
e3812fc048 am:
532d2b11a3 am:
6f514cc82b am:
5742a055e2
am:
bf11fae04e
Change-Id: I872dcd022b298f3f441a9d2315b3ec967e0af5bd
Ajay Panicker [Wed, 21 Sep 2016 02:55:36 +0000 (02:55 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485
am:
95b604ccb5
Change-Id: I78d80c17e2b7a0b6d0d611f738a3b880dd74dab0
Ajay Panicker [Wed, 21 Sep 2016 02:54:19 +0000 (02:54 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1 am:
3ed9e7693d
am:
853e39d3d9
Change-Id: I1f1f4f44161525bb4ee7fbbcabdd5a6e346d3b8a
TreeHugger Robot [Wed, 21 Sep 2016 02:46:05 +0000 (02:46 +0000)]
Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev
Ajay Panicker [Wed, 21 Sep 2016 02:40:31 +0000 (02:40 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77 am:
1682f67177
am:
13ac17ab3a
Change-Id: I495579b3cca396dd5fb6a628bedb5e5be4916b26
Ajay Panicker [Wed, 21 Sep 2016 02:38:56 +0000 (02:38 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa am:
b2e8361c50
am:
c147db7a79
Change-Id: I52a9da62a72e21a052561b8aa1760bedb8a4b8c6
Elliot Waite [Wed, 21 Sep 2016 02:38:10 +0000 (02:38 +0000)]
Merge "Fix some at links." into nyc-dev
am:
edc31f9593
Change-Id: I01ae10ce4ee5f0e224bd0ceb36c8e3dffb6c5aff
Elliot Waite [Wed, 21 Sep 2016 02:38:06 +0000 (02:38 +0000)]
Fix some at links.
am:
28d87163e1
Change-Id: I90f11e3705c546a8d37cf67a2b4de0a379497568
Doris Liu [Wed, 21 Sep 2016 02:37:40 +0000 (02:37 +0000)]
Merge "Improve Javadoc for AnimatedVectorDrawable" into nyc-mr1-dev
am:
85973e91d2
Change-Id: I4d1369f3ff89fe99ae8649867c36d3a132af4211
Ajay Panicker [Wed, 21 Sep 2016 02:37:38 +0000 (02:37 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e am:
d46605ab09
am:
fc7822f58a
Change-Id: I7b744f3d3c5e816a1722b20bad66b924911b8a36
Doris Liu [Wed, 21 Sep 2016 02:37:37 +0000 (02:37 +0000)]
Improve Javadoc for AnimatedVectorDrawable
am:
7d76fc4433
Change-Id: I930323ef0e9a058ebb916d68404dfb36e2e14421
Ajay Panicker [Wed, 21 Sep 2016 02:37:35 +0000 (02:37 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours
am:
6b16f71975
Change-Id: I2f7ec847c4d781a80e950c3ede965456163c90f9
Ajay Panicker [Wed, 21 Sep 2016 02:35:59 +0000 (02:35 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1
am:
3ed9e7693d
Change-Id: Ie6c2f8cf182d0787ffc401800134f30fde903e3b
Marie Janssen [Wed, 21 Sep 2016 02:26:05 +0000 (02:26 +0000)]
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am:
22046e7323 am:
e4f60787f3 am:
ce8032ebbb am:
0ed17e5c8d am:
9013d67f0c
am:
7e5b9e3d32
Change-Id: I92c466da144a731bab41e829ba1ad29fbbf789f7
Ajay Panicker [Wed, 21 Sep 2016 02:24:44 +0000 (02:24 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77
am:
1682f67177
Change-Id: I75da25a30cc7be28b3a2d332fa5ca7fc18322dfc
Marie Janssen [Wed, 21 Sep 2016 02:24:18 +0000 (02:24 +0000)]
Fix setPairingConfirmation permissions issue (2/2) am:
93326cfd9f am:
3106e3ae27 am:
e3812fc048 am:
532d2b11a3 am:
6f514cc82b
am:
5742a055e2
Change-Id: If850d33567371bc2a9bd4e2394b90ea84066b602
Ajay Panicker [Wed, 21 Sep 2016 02:24:08 +0000 (02:24 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours
am:
dcb78c9cf1
Change-Id: I196204c683a0eacbe08103b383dcd9cb1435a43d
OSDN Git Service
