OSDN Git Service
Adam Powell [Thu, 22 Sep 2016 17:47:40 +0000 (10:47 -0700)]
Null check for restoring LoaderManagers
Bug
31671195
Test: core/tests/coretests/src/android/app/LoaderLifecycleTest.java
Change-Id: Ib553f7611814cc6759488aec505fd126ee664a9d
Vladislav Kuzkokov [Thu, 22 Sep 2016 17:09:02 +0000 (17:09 +0000)]
Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 16:57:11 +0000 (16:57 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev
Ajay Panicker [Thu, 22 Sep 2016 16:08:32 +0000 (16:08 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a am:
8e172c638d -s ours am:
9338ffa148
am:
7e78a89923
Change-Id: I3027a2d1f49280a39eff5711413f38e6c48117b6
Ajay Panicker [Thu, 22 Sep 2016 14:24:38 +0000 (14:24 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a am:
8e172c638d -s ours
am:
9338ffa148
Change-Id: I92ec98b22ea071df0a24d19f8a6bb4523606089d
Jaewan Kim [Thu, 22 Sep 2016 14:24:35 +0000 (14:24 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261 am:
b2403f3102 am:
5decf8e715 -s ours am:
963c269ffa
am:
c56cabef9d
Change-Id: I8b96206d95e5da72027a62251c910903230946d9
Jaewan Kim [Thu, 22 Sep 2016 13:57:14 +0000 (13:57 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261 am:
b2403f3102 am:
5decf8e715 -s ours
am:
963c269ffa
Change-Id: Ife5fa9fb43fb28eb8e71a7707c846c58d18478b4
Jaewan Kim [Thu, 22 Sep 2016 12:26:49 +0000 (12:26 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98 am:
ff1c1993b7 am:
35e95d82d7 -s ours am:
2ccdbce954
am:
091681149b
Change-Id: I0fb73df3b32342897159f99b8f1ee99b975f8874
Ajay Panicker [Thu, 22 Sep 2016 10:53:39 +0000 (10:53 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a
am:
8e172c638d -s ours
Change-Id: I6ed9ac6f79a853f08fbc3105cade0d47033701f0
Jaewan Kim [Thu, 22 Sep 2016 10:52:37 +0000 (10:52 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261 am:
b2403f3102
am:
5decf8e715 -s ours
Change-Id: I79036440c10f32b4a30fbefa3a3ff65ebd9fc69e
Jaewan Kim [Thu, 22 Sep 2016 10:50:05 +0000 (10:50 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98 am:
ff1c1993b7 am:
35e95d82d7 -s ours
am:
2ccdbce954
Change-Id: Iede8b78ecc2ae054266286d69317b655263deacc
Bill Yi [Thu, 22 Sep 2016 10:23:07 +0000 (10:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am:
994ec6a0ec -s ours
Change-Id: Ida7cf9408ad94d3a17fc7b1154f0644c1ae33442
Bill Yi [Thu, 22 Sep 2016 10:23:04 +0000 (10:23 +0000)]
Import translations. DO NOT MERGE
am:
a6c51e2c94 -s ours
Change-Id: I4e82725c53421b83579b8f3ced716366eaa8df51
TreeHugger Robot [Thu, 22 Sep 2016 09:54:10 +0000 (09:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 09:53:00 +0000 (09:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 09:51:57 +0000 (09:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jaewan Kim [Thu, 22 Sep 2016 08:07:35 +0000 (08:07 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98 am:
ff1c1993b7
am:
35e95d82d7 -s ours
Change-Id: I5fe98000c623199706bd3879a361ef72e0da2ccb
Ajay Panicker [Thu, 22 Sep 2016 07:36:50 +0000 (07:36 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332
am:
993015ce9a
Change-Id: I19514d41db780f41114fe05e86360beeda44352b
Jaewan Kim [Thu, 22 Sep 2016 07:35:45 +0000 (07:35 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261
am:
b2403f3102
Change-Id: Ia418a5eb08b7f5cdb2a987c4f17708069012c0e5
Jaewan Kim [Thu, 22 Sep 2016 07:34:55 +0000 (07:34 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98
am:
ff1c1993b7
Change-Id: I60355987ea0814314c2f79041d068e099b158c7b
Elliot Waite [Thu, 22 Sep 2016 06:46:29 +0000 (06:46 +0000)]
Merge "Revert fixed at links." into nyc-dev am:
c77b72f244
am:
8ea167bf7a
Change-Id: I340bb9df7c736f1c4f22c53cf8919d36f024c32e
Elliot Waite [Thu, 22 Sep 2016 06:45:29 +0000 (06:45 +0000)]
Revert fixed at links. am:
7c70fed347
am:
4a60ffd518
Change-Id: I24d872329e40cea924da713ec3c4f869ab012824
Adarsh Fernando [Thu, 22 Sep 2016 06:44:43 +0000 (06:44 +0000)]
Found a couple of more references to Android N. am:
9af57aa309
am:
9a91d6662e
Change-Id: I82ea73e071445ca4d07602fa54ba1f03f57635b3
Adarsh Fernando [Thu, 22 Sep 2016 06:43:57 +0000 (06:43 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am:
fe060d3f37
am:
453160c39d
Change-Id: I5ca41ea38bfc46ed81d9319f7ce20da7e6399e0d
Adarsh Fernando [Thu, 22 Sep 2016 06:43:14 +0000 (06:43 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs. am:
4b6d939321
am:
0b8e646225
Change-Id: If303eafb66a971de300758af21a5a830084d0aff
Stuart Scott [Thu, 22 Sep 2016 06:41:55 +0000 (06:41 +0000)]
Merge "Continue if package is not in system" into nyc-dr1-dev
am:
cffe1f48d3
Change-Id: I490c87e5e70059406d3088b3ab8537bd6e42b38c
Stuart Scott [Thu, 22 Sep 2016 06:41:52 +0000 (06:41 +0000)]
Continue if package is not in system
am:
434c8db80f
Change-Id: Ie2a9741583bb09ddcb27e28e18f29d63f371c8ff
Jaewan Kim [Thu, 22 Sep 2016 06:41:02 +0000 (06:41 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am:
8ba2549592
am:
60d2af330b
Change-Id: I1a234ee41fc85cbe954990d13b5de123efe9afc8
Jaewan Kim [Thu, 22 Sep 2016 06:40:10 +0000 (06:40 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
09c3df004b
am:
01796f794d
Change-Id: Ifdeb43d20983d31713defaae3d7e0075a11cb562
Bill Yi [Thu, 22 Sep 2016 06:05:36 +0000 (23:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib207a07629651b14f450065e8314b2d8b3252c35
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Sep 2016 05:59:39 +0000 (22:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ebb252040d261a9ce7dc01d080b9cc82c644533
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Sep 2016 05:35:25 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55e1719cddf0d684ff7b5c89f11a1d0c6bb49a97
Auto-generated-cl: translation import
Ajay Panicker [Thu, 22 Sep 2016 04:56:04 +0000 (04:56 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470
am:
1783182332
Change-Id: Ia62f75205e5d8406249991175fc5cf66d1f2bdb9
Jaewan Kim [Thu, 22 Sep 2016 04:55:18 +0000 (04:55 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13
am:
78fa55e261
Change-Id: I81587010e753fd1f23a530c973675fe0790b8b33
Jaewan Kim [Thu, 22 Sep 2016 04:54:25 +0000 (04:54 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106
am:
868d586c98
Change-Id: Icc7c4e12e75f5b27c41866fcb8d8553fcffd90ab
Elliot Waite [Thu, 22 Sep 2016 03:49:12 +0000 (03:49 +0000)]
Merge "Revert fixed at links." into nyc-dev
am:
c77b72f244
Change-Id: I2ee03bed08613ad562cd62fdae1c1bc526c10be4
Elliot Waite [Thu, 22 Sep 2016 03:49:08 +0000 (03:49 +0000)]
Revert fixed at links.
am:
7c70fed347
Change-Id: I69a15936193917911224af7f417b16d30dd8dfe4
Adarsh Fernando [Thu, 22 Sep 2016 03:48:21 +0000 (03:48 +0000)]
Found a couple of more references to Android N.
am:
9af57aa309
Change-Id: I2a72b761fdb8fddbda7aca792a08c851595b29ac
Adarsh Fernando [Thu, 22 Sep 2016 03:47:02 +0000 (03:47 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
am:
fe060d3f37
Change-Id: I4c7c2363cea058a1b905b07826ffba5a4439f833
Ajay Panicker [Thu, 22 Sep 2016 03:47:01 +0000 (03:47 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours
am:
c56c079470
Change-Id: Ie03995ef39bce15b5279ff78ef23e94401eab9db
Adarsh Fernando [Thu, 22 Sep 2016 03:46:55 +0000 (03:46 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs.
am:
4b6d939321
Change-Id: Ife2fba8fa61083ccaf2c3f4a3df88418bd0a316b
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
Elliot Waite [Thu, 22 Sep 2016 02:19:41 +0000 (02:19 +0000)]
Merge "Revert fixed at links." into nyc-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
Ajay Panicker [Thu, 22 Sep 2016 01:34:51 +0000 (01:34 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1
am:
8be4dc7e16 -s ours
Change-Id: Ic7a46031556a3ae24d8f56808c0b9c631cf931a4
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
Elliot Waite [Wed, 21 Sep 2016 22:47:30 +0000 (15:47 -0700)]
Revert fixed at links.
This reverts commit
c4ae7827e26ab3d0ac340d896c28c166da860fdb.
Change-Id: I65729721ced7fc04d0b9691b63520007adddee29
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
Stuart Scott [Wed, 21 Sep 2016 22:58:53 +0000 (22:58 +0000)]
Merge "Continue if package is not in system" into nyc-dr1-dev
Jaewan Kim [Wed, 21 Sep 2016 22:54:04 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
am:
8ba2549592
Change-Id: I5593d4149bbd8235d42a0cb2b23c9fb091aa70f9
Jaewan Kim [Wed, 21 Sep 2016 22:54:02 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
am:
22c9458a13
Change-Id: Ie3279270215a99f9b7f98dc6325f4cc7c431cc9b
Jaewan Kim [Wed, 21 Sep 2016 22:53:59 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
09c3df004b
Change-Id: Ib883850c8554fae35e29313e2ea6a19e3592148c
Jaewan Kim [Wed, 21 Sep 2016 22:53:58 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
c282c4f106
Change-Id: I8ec1e339f50ab7d017bcf91cddefc2b0f569c696
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
Adarsh Fernando [Wed, 21 Sep 2016 22:45:04 +0000 (15:45 -0700)]
Found a couple of more references to Android N.
Bug:
31647521
Change-Id: I9f8c40e43cb79656761f237a0f144ab8a9b4c5d5
Ben Lin [Wed, 21 Sep 2016 22:34:52 +0000 (22:34 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev
Adarsh Fernando [Wed, 21 Sep 2016 22:26:48 +0000 (22:26 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-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
Adarsh Fernando [Wed, 21 Sep 2016 20:56:37 +0000 (13:56 -0700)]
Docs: Cleanup of Preview language in Android 7.0 docs.
bug:
31647521
Change-Id: I882f7d7cb5bb1ddcc18ddbc29b17edbbbd84131a
Ajay Panicker [Wed, 21 Sep 2016 21:55:52 +0000 (21:55 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4
am:
46442d1be1
Change-Id: I50616eafb788247b103911bd5ac899899e3ba47c
TreeHugger Robot [Wed, 21 Sep 2016 21:47:00 +0000 (21:47 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
TreeHugger Robot [Wed, 21 Sep 2016 21:46:41 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
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
Ajay Panicker [Wed, 21 Sep 2016 21:15:32 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
85bc33a8f4
Change-Id: I2194d4c01e8bff53a7d6fcdf25513b216a511155
Stuart Scott [Wed, 21 Sep 2016 21:04:22 +0000 (14:04 -0700)]
Continue if package is not in system
bug:
29546655
Change-Id: Ieb17534d60db4643180b915f9b10b0c79a2224e2
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: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: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
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 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: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
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
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