TreeHugger Robot
96b97d722f
Merge "Disallow entering PiP without dismissing keyguard."
2016-12-29 20:29:45 +00:00
Ivan Podogov
afa10b8097
Merge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d am: e11c3f6657
...
am: c7fad3b056
2016-12-29 20:10:00 +00:00
Ivan Podogov
48e6745a08
Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499 am: 91ab2e2f98
...
am: 48738f5ad0
2016-12-29 20:08:38 +00:00
Hemant Gupta
c519b8d83e
Bluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9 am: 1ee22b7f70
...
am: a9c92c2442
2016-12-29 20:07:51 +00:00
Ivan Podogov
c7fad3b056
Merge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d
...
am: e11c3f6657
2016-12-29 20:00:52 +00:00
Ivan Podogov
48738f5ad0
Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499
...
am: 91ab2e2f98
2016-12-29 20:00:09 +00:00
Hemant Gupta
a9c92c2442
Bluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9
...
am: 1ee22b7f70
2016-12-29 19:59:28 +00:00
Shahriyar Amini
9d621c4977
Merge "Make methods for Tile content provider data public."
2016-12-29 19:56:29 +00:00
Ivan Podogov
e11c3f6657
Merge changes from topic 'HID-Client' am: 8a74d0440c
...
am: 59d63e8b1d
2016-12-29 19:47:47 +00:00
Ivan Podogov
91ab2e2f98
Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5
...
am: 94e3d3f499
2016-12-29 19:46:55 +00:00
Hemant Gupta
1ee22b7f70
Bluetooth: Add support for HID Device Role am: e88fd4b594
...
am: ee469c6fe9
2016-12-29 19:46:08 +00:00
Ivan Podogov
59d63e8b1d
Merge changes from topic 'HID-Client'
...
am: 8a74d0440c
2016-12-29 19:39:07 +00:00
Ivan Podogov
94e3d3f499
Rename the Bluetooth profile classes for HID Device role.
...
am: 0afe190af5
2016-12-29 19:38:41 +00:00
Hemant Gupta
ee469c6fe9
Bluetooth: Add support for HID Device Role
...
am: e88fd4b594
2016-12-29 19:37:58 +00:00
Treehugger Robot
8a74d0440c
Merge changes from topic 'HID-Client'
...
* changes:
Rename the Bluetooth profile classes for HID Device role.
Bluetooth: Add support for HID Device Role
2016-12-29 19:29:17 +00:00
Winson Chung
0655da0374
Disallow entering PiP without dismissing keyguard.
...
- If an activity is showing on the keyguard and enters picture-
in-picture, then prompt the user to authenticate first
- Fixing NPE in SystemUI due to null runnable being added to the
post-keyguard-gone callbacks
- Prevent FLAG_SHOW_WHEN_LOCKED from applying when determining
visibility over keyguard for activities that are in the pinned
stack
Bug: 33660880
Test: android.server.cts.KeyguardLockedTests
Test: #testEnterPipOverKeyguard
Change-Id: I89477a8a0067e285e5d0122e918fac45274c57ad
2016-12-29 10:53:23 -08:00
Svetoslav Ganov
17f739d924
Merge "Revert "Don't allow permission change to runtime""
2016-12-29 18:26:07 +00:00
Svetoslav Ganov
5b95d07725
Revert "Don't allow permission change to runtime"
...
This reverts commit 0f929c5320
2016-12-29 18:25:27 +00:00
Geoffrey Pitsch
f47277805a
Merge "Change Notification Inline Settings for Channels"
2016-12-29 15:36:56 +00:00
Ivan Podogov
0afe190af5
Rename the Bluetooth profile classes for HID Device role.
...
We already have BluetoothInputDevice class, so adding something
called BluetoothHidDevice seems confusing. On the other hand,
the new class is designed to connect to HID Host devices, so
naming it BluetoothInputHost makes sense and goes in line with
the existing BluetoothInputDevice.
The same goes for the new constant HID_DEVICE that is just as
confusing to have together with the INPUT_DEVICE one.
This CL also renames the "connection state changed" broadcast
(for the same reasons), declares it as an SDK constant, and also
adds some javadoc to it.
Note that BluetoothHidDeviceApp* classes remained unchanged, as
those correspond to the app that implements the Device (and
connects to the Host).
Test: make
Change-Id: I5075ca5b97db3c1dd403c2e9660eecc7380cffe2
2016-12-29 14:30:40 +00:00
Hemant Gupta
e88fd4b594
Bluetooth: Add support for HID Device Role
...
This patch adds the HID Device Role support in Bluetooth framework.
Also AIDL and callback related files for HID Device role are added
to provide interface for third party applications to communicate with
HID Device Service.
Change-Id: Id03a362b7bcfa2e76056fa0197eaac12ce49b5a2
2016-12-29 14:29:53 +00:00
Tony Mak
bf9928de18
Make sure ServiceConnection callback is called in main thread
...
Fix: 33568999
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases
--test com.android.cts.devicepolicy.DeviceOwnerPlusManagedProfileTest
Change-Id: I14c8b5b1f78192429e68a3057430406245a909c8
2016-12-29 14:07:46 +00:00
Charles He
5394fd0450
Remove duplicate lines due to automerger
...
Test: make
Bug: 30352311
Change-Id: Ic476be8fca733414589202701fe91e5eb47e97fb
2016-12-29 12:53:58 +00:00
Selim Cinek
3e555495fc
Merge "Improved the behavior with the empty shade view"
2016-12-29 12:26:44 +00:00
Selim Cinek
fe0f4357a1
Merge "Fixed a bug where notifications could stay expanded"
2016-12-29 12:26:07 +00:00
Charles He
c5f81651a1
Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 2c29250b44" into nyc-mr2-dev-plus-aosp
...
am: b5a5a51623
2016-12-29 11:58:01 +00:00
Charles He
c905c2e588
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 2c29250b44
...
am: 7aa7ee7338
2016-12-29 11:57:50 +00:00
Charles He
051803f04a
Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 171fa83224" into nyc-mr2-dev-plus-aosp
...
am: 140ac4efb5
2016-12-29 11:56:00 +00:00
Charles He
11cbd13474
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 171fa83224
...
am: cc2c82436e
2016-12-29 11:55:48 +00:00
Charles He
d2d439e19b
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: 0881d980ad" into nyc-mr2-dev-plus-aosp
...
am: 2518cfcc59
2016-12-29 11:53:47 +00:00
Charles He
b5c1a16e31
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: 0881d980ad
...
am: ac437a2961
2016-12-29 11:53:36 +00:00
Charles He
2125ea1a00
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: fdcec75c74" into nyc-mr2-dev-plus-aosp
...
am: bf9a3b4b0d
2016-12-29 11:51:43 +00:00
Charles He
a54f83c99c
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: fdcec75c74
...
am: f2263e3a5e
2016-12-29 11:51:30 +00:00
Charles He
5da3442d27
Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: ccf6c25b3c" into nyc-mr2-dev-plus-aosp
...
am: 78129e30a4
2016-12-29 11:49:33 +00:00
Charles He
970370a9b9
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: ccf6c25b3c
...
am: d4dcbc44e9
2016-12-29 11:49:21 +00:00
Charles He
5e8f5f32cd
Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: e167e6d284" into nyc-mr2-dev-plus-aosp
...
am: 35f1af792d
2016-12-29 11:43:45 +00:00
Charles He
e0d1a6f2a3
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: e167e6d284
...
am: 4c57f6f500
2016-12-29 11:43:34 +00:00
Charles He
64e9bb46b2
Merge "Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 am: 22faa73586" into nyc-mr2-dev-plus-aosp
...
am: 424aa97a10
2016-12-29 11:38:41 +00:00
Charles He
5e9870f7de
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 am: 22faa73586
...
am: 503794154d
2016-12-29 11:38:32 +00:00
Charles He
bcf0dbcd5d
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 am: 065e387455
...
am: fce4eb6810
2016-12-29 11:37:01 +00:00
Android Build Merger (Role)
b5a5a51623
Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 2c29250b44" into nyc-mr2-dev-plus-aosp
2016-12-29 11:28:50 +00:00
Android Build Merger (Role)
140ac4efb5
Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 171fa83224" into nyc-mr2-dev-plus-aosp
2016-12-29 11:28:24 +00:00
Charles He
7aa7ee7338
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff
...
am: 2c29250b44
2016-12-29 11:28:03 +00:00
Charles He
cc2c82436e
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff
...
am: 171fa83224
2016-12-29 11:27:37 +00:00
Android Build Merger (Role)
2518cfcc59
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: 0881d980ad" into nyc-mr2-dev-plus-aosp
2016-12-29 11:27:37 +00:00
Android Build Merger (Role)
bf9a3b4b0d
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: fdcec75c74" into nyc-mr2-dev-plus-aosp
2016-12-29 11:27:10 +00:00
Charles He
ac437a2961
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231
...
am: 0881d980ad
2016-12-29 11:26:50 +00:00
Charles He
f2263e3a5e
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231
...
am: fdcec75c74
2016-12-29 11:26:23 +00:00
Android Build Merger (Role)
78129e30a4
Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: ccf6c25b3c" into nyc-mr2-dev-plus-aosp
2016-12-29 11:26:22 +00:00
Android Build Merger (Role)
35f1af792d
Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: e167e6d284" into nyc-mr2-dev-plus-aosp
2016-12-29 11:25:59 +00:00
