Ajay Panicker
3e238e3396
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
2016-09-21 02:38:56 +00:00
Elliot Waite
7072b952c8
Merge "Fix some at links." into nyc-dev
...
am: edc31f9593
2016-09-21 02:38:10 +00:00
Elliot Waite
f3bbfdaf9d
Fix some at links.
...
am: 28d87163e1
2016-09-21 02:38:06 +00:00
Doris Liu
ef2dafbbe4
Merge "Improve Javadoc for AnimatedVectorDrawable" into nyc-mr1-dev
...
am: 85973e91d2
2016-09-21 02:37:40 +00:00
Ajay Panicker
93a622150f
[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
2016-09-21 02:37:38 +00:00
Doris Liu
f6088e45e0
Improve Javadoc for AnimatedVectorDrawable
...
am: 7d76fc4433
2016-09-21 02:37:37 +00:00
Ajay Panicker
dddb99f020
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours
...
am: 6b16f71975
2016-09-21 02:37:35 +00:00
Ajay Panicker
853e39d3d9
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
2016-09-21 02:35:59 +00:00
Android Build Merger (Role)
75c6b50055
Merge changes from topic 'am-15128313c71649e3bd36a27ab8405fce' into nyc-mr1-dev-plus-aosp
...
* changes:
Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev am: 3ef3f62fa59730f8bae271e9ea677049985fb986
2016-09-21 02:26:06 +00:00
Marie Janssen
32ae78598d
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d am: 9013d67f0c
...
am: 7e5b9e3d32
2016-09-21 02:26:05 +00:00
Ajay Panicker
13ac17ab3a
[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
2016-09-21 02:24:44 +00:00
Marie Janssen
bf11fae04e
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 am: 6f514cc82b
...
am: 5742a055e2
2016-09-21 02:24:18 +00:00
Amit Mahajan
96a00297ef
Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev am: 3ef3f62fa5
...
am: 9730f8bae2
2016-09-21 02:24:15 +00:00
Ajay Panicker
3ed9e7693d
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
2016-09-21 02:24:08 +00:00
Ajay Panicker
c147db7a79
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
2016-09-21 02:23:37 +00:00
Amit Mahajan
6a6bfb8236
Added new config to indicate uneditable APN fields. am: 71e9ea6770
...
am: 49985fb986
2016-09-21 02:22:35 +00:00
Marie Janssen
f53d0f4925
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d am: 9013d67f0c
...
am: 7e593bdf0d
2016-09-21 02:22:11 +00:00
Ajay Panicker
95b604ccb5
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev
...
am: 60bf672485
2016-09-21 02:22:08 +00:00
Ajay Panicker
fc7822f58a
[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
2016-09-21 02:21:15 +00:00
Marie Janssen
21688f8e34
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 am: 6f514cc82b
...
am: dbb8ffc47d
2016-09-21 02:20:22 +00:00
TreeHugger Robot
85973e91d2
Merge "Improve Javadoc for AnimatedVectorDrawable" into nyc-mr1-dev
2016-09-21 02:16:35 +00:00
Elliot Waite
edc31f9593
Merge "Fix some at links." into nyc-dev
2016-09-21 02:15:17 +00:00
Amit Mahajan
9730f8bae2
Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev
...
am: 3ef3f62fa5
2016-09-21 02:11:54 +00:00
Amit Mahajan
49985fb986
Added new config to indicate uneditable APN fields.
...
am: 71e9ea6770
2016-09-21 02:11:36 +00:00
Ajay Panicker
6b16f71975
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113
...
am: b2094f7c37
2016-09-21 02:09:09 +00:00
Ajay Panicker
1682f67177
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours
...
am: 0f464f9d77
2016-09-21 02:03:46 +00:00
Ajay Panicker
b2e8361c50
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
2016-09-21 02:02:47 +00:00
Marie Janssen
7e593bdf0d
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d
...
am: 9013d67f0c
2016-09-21 02:02:04 +00:00
Ajay Panicker
d46605ab09
[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
2016-09-21 02:01:38 +00:00
Ajay Panicker
b2094f7c37
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957
...
am: cc4fd13113
2016-09-21 02:00:25 +00:00
Jeff Sharkey
83fdd36ee3
Merge "Check if anyone could possibly provide service." into nyc-mr1-dev am: 7da2a0c571
...
am: d77b0309ac
2016-09-21 01:59:56 +00:00
Marie Janssen
dbb8ffc47d
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3
...
am: 6f514cc82b
2016-09-21 01:59:29 +00:00
Jeff Sharkey
a6cc94a1f4
Check if anyone could possibly provide service. am: f6e9b95127
...
am: 0e928ee97b
2016-09-21 01:58:39 +00:00
Erik Kline
b1241819f3
Merge "Handle more commands in StoppingState" into nyc-mr1-dev am: 9ed777d03d
...
am: 6569c05f02
2016-09-21 01:57:22 +00:00
Erik Kline
7686b9f03c
Handle more commands in StoppingState am: 8ec1dc8117
...
am: 103eeee194
2016-09-21 01:56:18 +00:00
Jaewan Kim
c282c4f106
DO NOT MERGE Check caller for sending media key to global priority session
...
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
2016-09-21 10:50:19 +09:00
TreeHugger Robot
3ef3f62fa5
Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev
2016-09-21 01:45:53 +00:00
Jaewan Kim
4e9af38ec4
DO NOT MERGE Check caller for sending media key to global priority session
...
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
2016-09-21 10:44:09 +09:00
Jaewan Kim
6a1567c267
DO NOT MERGE Check caller for sending media key to global priority session
...
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
2016-09-21 10:42:53 +09:00
Jaewan Kim
09c3df004b
DO NOT MERGE Check caller for sending media key to global priority session
...
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
2016-09-21 10:39:42 +09:00
Marie Janssen
7e5b9e3d32
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d
...
am: 9013d67f0c
2016-09-21 01:34:29 +00:00
Marie Janssen
5742a055e2
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3
...
am: 6f514cc82b
2016-09-21 01:32:37 +00:00
Jeff Sharkey
d77b0309ac
Merge "Check if anyone could possibly provide service." into nyc-mr1-dev
...
am: 7da2a0c571
2016-09-21 01:23:59 +00:00
Jeff Sharkey
0e928ee97b
Check if anyone could possibly provide service.
...
am: f6e9b95127
2016-09-21 01:23:55 +00:00
Erik Kline
6569c05f02
Merge "Handle more commands in StoppingState" into nyc-mr1-dev
...
am: 9ed777d03d
2016-09-21 01:22:34 +00:00
Erik Kline
103eeee194
Handle more commands in StoppingState
...
am: 8ec1dc8117
2016-09-21 01:22:31 +00:00
Felipe Leme
f1da90fe04
Listen to ACTION_UID_REMOVED only. DO NOT MERGE.
...
NMPS was listening to both ACTION_UID_REMOVED and
ACTION_PACKAGE_REMOVED, which not only was redundant but would also
cause problems when a package with shared UIDs was removed.
Fixes: 31375684
Change-Id: Iec006dbbec0e6298f1e568cbf81ed3672f61b7d2
(cherry picked from commit fdebbea401
2016-09-21 01:11:26 +00:00
Jeff Sharkey
7da2a0c571
Merge "Check if anyone could possibly provide service." into nyc-mr1-dev
2016-09-21 01:08:18 +00:00
Erik Kline
9ed777d03d
Merge "Handle more commands in StoppingState" into nyc-mr1-dev
2016-09-21 01:05:33 +00:00
Marie Janssen
9013d67f0c
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb
...
am: 0ed17e5c8d
2016-09-21 01:04:28 +00:00
