Yueming Wang
a91c4ac73c
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev am: 3cc7c4fc76
...
am: 5148a2e55f
2018-03-27 10:45:58 +00:00
Yueming Wang
5148a2e55f
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev
...
am: 3cc7c4fc76
2018-03-27 10:30:37 +00:00
Yueming Wang
3cc7c4fc76
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev
2018-03-27 10:19:13 +00:00
Eric Sandness
d6382ed1a1
Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev am: 1ad8367249
...
am: 135b4fa15c
2018-03-27 10:09:51 +00:00
Eric Sandness
135b4fa15c
Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev
...
am: 1ad8367249
2018-03-27 10:03:32 +00:00
Eric Sandness
1ad8367249
Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev
2018-03-27 09:52:58 +00:00
yuemingw
6586f05457
Add javadoc to explain ApnSetting conflict.
...
As per discussion with Amit, it's better to define "conflict"
of ApnSetting in DevicePolicyManager API javadoc.
Bug: 72153573
Test: not required.
Change-Id: I765dace36a3c9c491c988dc0a87479cdec620e37
2018-03-27 08:29:05 +00:00
Ruchi Kandoi
11842e0bba
Merge "Modify Open Mobile API to follow Android API guidelines" am: ee63876ed4 am: 2fa5be61cb
...
am: b126fbb86a
2018-03-27 06:23:25 +00:00
Ruchi Kandoi
b126fbb86a
Merge "Modify Open Mobile API to follow Android API guidelines" am: ee63876ed4
...
am: 2fa5be61cb
2018-03-27 06:09:49 +00:00
Ruchi Kandoi
2fa5be61cb
Merge "Modify Open Mobile API to follow Android API guidelines"
...
am: ee63876ed4
2018-03-27 06:03:08 +00:00
Felipe Leme
82eca0fb60
Merge "Integrate autofill session lifecycle with URL bar changes when on compat mode." into pi-dev am: 992d078542
...
am: 85584bcb20
2018-03-27 05:42:41 +00:00
Felipe Leme
85584bcb20
Merge "Integrate autofill session lifecycle with URL bar changes when on compat mode." into pi-dev
...
am: 992d078542
2018-03-27 05:30:59 +00:00
TreeHugger Robot
992d078542
Merge "Integrate autofill session lifecycle with URL bar changes when on compat mode." into pi-dev
2018-03-27 05:15:20 +00:00
Jeff Sharkey
b5bbf4b2c3
Merge "API council requested tweaks to TrafficStats." into pi-dev am: 9a6bc76ee8
...
am: efae42a25d
2018-03-27 04:41:54 +00:00
Treehugger Robot
ee63876ed4
Merge "Modify Open Mobile API to follow Android API guidelines"
2018-03-27 04:40:40 +00:00
Jeff Sharkey
6b2753c027
Merge "Report final progress when finished copying." into pi-dev am: 01f2ff1aa4
...
am: 190d3520af
2018-03-27 04:28:07 +00:00
Jeff Sharkey
efae42a25d
Merge "API council requested tweaks to TrafficStats." into pi-dev
...
am: 9a6bc76ee8
2018-03-27 03:57:46 +00:00
Jerry Zhang
e52c2b98e9
Merge "Write descriptors for Mtp in UsbService" into pi-dev am: df101a4596
...
am: 03f2788598
2018-03-27 03:57:23 +00:00
Jeff Sharkey
190d3520af
Merge "Report final progress when finished copying." into pi-dev
...
am: 01f2ff1aa4
2018-03-27 03:45:07 +00:00
Jeff Sharkey
549baaa41f
Merge "API council requested tweaks to SystemClock." into pi-dev am: 0bff5a6dfa
...
am: de5b4f3c99
2018-03-27 03:29:15 +00:00
Jerry Zhang
03f2788598
Merge "Write descriptors for Mtp in UsbService" into pi-dev
...
am: df101a4596
2018-03-27 03:20:27 +00:00
Jeff Sharkey
de5b4f3c99
Merge "API council requested tweaks to SystemClock." into pi-dev
...
am: 0bff5a6dfa
2018-03-27 03:04:34 +00:00
Jeff Sharkey
da47ba1806
Merge "API council requested tweaks to DataUnit." into pi-dev am: b15bcea4d4
...
am: 2b00e5c3fd
2018-03-27 03:01:08 +00:00
TreeHugger Robot
9a6bc76ee8
Merge "API council requested tweaks to TrafficStats." into pi-dev
2018-03-27 02:56:24 +00:00
TreeHugger Robot
01f2ff1aa4
Merge "Report final progress when finished copying." into pi-dev
2018-03-27 02:52:26 +00:00
Jerry Zhang
df101a4596
Merge "Write descriptors for Mtp in UsbService" into pi-dev
2018-03-27 02:49:02 +00:00
Jeff Sharkey
2b00e5c3fd
Merge "API council requested tweaks to DataUnit." into pi-dev
...
am: b15bcea4d4
2018-03-27 02:41:52 +00:00
TreeHugger Robot
0bff5a6dfa
Merge "API council requested tweaks to SystemClock." into pi-dev
2018-03-27 02:40:24 +00:00
Jeff Sharkey
78232ee54b
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev am: fee443bfab
...
am: 9d81c54bc8
2018-03-27 02:37:11 +00:00
TreeHugger Robot
b15bcea4d4
Merge "API council requested tweaks to DataUnit." into pi-dev
2018-03-27 02:30:25 +00:00
Jeff Sharkey
9d81c54bc8
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev
...
am: fee443bfab
2018-03-27 01:53:01 +00:00
TreeHugger Robot
fee443bfab
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev
2018-03-27 01:40:23 +00:00
Seigo Nonaka
e0d616424f
Merge "Stop using DynamicLayout in case of non selectable PrecomputedText" into pi-dev am: a1ff74c68d
...
am: b2d133a858
2018-03-27 01:36:16 +00:00
Seigo Nonaka
b2d133a858
Merge "Stop using DynamicLayout in case of non selectable PrecomputedText" into pi-dev
...
am: a1ff74c68d
2018-03-27 01:11:24 +00:00
Abodunrinwa Toki
b1b18064eb
Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev am: d982f561cc
...
am: 62c135418d
2018-03-27 00:18:34 +00:00
TreeHugger Robot
a1ff74c68d
Merge "Stop using DynamicLayout in case of non selectable PrecomputedText" into pi-dev
2018-03-27 00:10:11 +00:00
Abodunrinwa Toki
62c135418d
Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev
...
am: d982f561cc
2018-03-26 23:59:02 +00:00
TreeHugger Robot
d3a6af439e
Merge "Add the AVRCP Target Service (2/2)" into pi-dev
2018-03-26 23:54:39 +00:00
Dmitry Dementyev
a72ccc76b5
Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev am: 5b4a0d6751
...
am: 82476a3d52
2018-03-26 23:36:47 +00:00
Ruchi Kandoi
d785fc4f6d
Modify Open Mobile API to follow Android API guidelines
...
- Add @Nullable/@NonNull to input arguments for APIs
- Remove deprecated methods openBasicChannel(aid) and
openLogicalChannel(aid)
- SecureElementListener is converted to a stand-alone interface
- serviceConnected() callback is renamed to onServiceConnected()
Bug: 64994044
Test: Run Cts Test
Change-Id: I503044a26a81dae8befb87fb8e8ac96d19de883b
2018-03-26 23:28:26 +00:00
Dmitry Dementyev
82476a3d52
Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev
...
am: 5b4a0d6751
2018-03-26 23:26:27 +00:00
TreeHugger Robot
d982f561cc
Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev
2018-03-26 23:21:37 +00:00
Ajay Panicker
0a9258f435
Add the AVRCP Target Service (2/2)
...
Add the AVRCP Target constant to Bluetooth Profile. Also remove redundant
public static final modifier on the constants.
Bug: 68854188
Test: Compiles and local test with service enabled
Change-Id: If2ec607fc704c225f8903d438fe970dfafac25f1
(cherry picked from commit 38c3073ba2
2018-03-26 23:11:09 +00:00
Philip P. Moltmann
4d5c36a19c
Merge "Make PackageManager#getNamesForUids testable." into pi-dev am: 9360a31f5f
...
am: 895b6a19a6
2018-03-26 23:08:15 +00:00
Dmitry Dementyev
5b4a0d6751
Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev
2018-03-26 23:07:23 +00:00
Philip P. Moltmann
895b6a19a6
Merge "Make PackageManager#getNamesForUids testable." into pi-dev
...
am: 9360a31f5f
2018-03-26 22:56:01 +00:00
Jeff Sharkey
acbde7d5d3
Report final progress when finished copying.
...
Test: none
Bug: 74120182
Change-Id: I984d38505545b5f18dd3dd9a3c6f714a9ea86edd
2018-03-26 16:54:38 -06:00
Tyler Gunn
b408ebe557
Merge "Add exception catching for BlockedNumberContract methods used by Telecom." am: 13791285aa am: 7f4c7a1b88
...
am: 8b07cc5819
2018-03-26 22:49:23 +00:00
Tyler Gunn
8b07cc5819
Merge "Add exception catching for BlockedNumberContract methods used by Telecom." am: 13791285aa
...
am: 7f4c7a1b88
2018-03-26 22:39:19 +00:00
TreeHugger Robot
9360a31f5f
Merge "Make PackageManager#getNamesForUids testable." into pi-dev
2018-03-26 22:36:45 +00:00
