OSDN Git Service
Nicolas Prevot [Thu, 5 Jan 2017 10:29:34 +0000 (10:29 +0000)]
Make disallow add/remove managed profile restriction not global.
Otherwise: if the DO sets remove managed profile user restriction:
the profile owner of a managed profile cannot remove this managed
profile.
BUG:
33854430
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I90b2028ea627a2073298bf9ef3c07b4fdf8d13a1
Donghyun Cho [Mon, 2 Jan 2017 09:52:46 +0000 (09:52 +0000)]
Merge "CEC: Revive a standby handler"
Donghyun Cho [Fri, 23 Dec 2016 06:53:28 +0000 (15:53 +0900)]
CEC: Revive a standby handler
When a device is going into standby state, every CEC message is supposed
to be handled by HdmiCecStandbyModeHandler. But the messages were
blocked by address allocation check and just buffered. This change
revives the standby handler so that the device can handle messages
properly during standby mode.
Bug:
30184027, Bug:
31873357, Bug:
33095971
Test: One touch play with chromecast works well during standby mode
Change-Id: I3315fdaee346838c6a2c68bad0ac64b94ab9723c
Donghyun Cho [Fri, 23 Dec 2016 09:30:37 +0000 (18:30 +0900)]
CEC: Ignore audio status update when system audio mode is off
Bug:
32052505
Test: Simulate receiving <Report Audio Status> while SAM is off
Change-Id: I9121928fc5a588f412b392fcfe76608391d92ad4
(cherry picked from commit
46b86aada358947869365ba9b06adcecbbc83c0f)
Donghyun Cho [Mon, 2 Jan 2017 04:52:34 +0000 (04:52 +0000)]
Merge "Use AlertDialog for MediaRouteControllerDialog"
Donghyun Cho [Thu, 22 Dec 2016 15:50:57 +0000 (00:50 +0900)]
Use AlertDialog for MediaRouteControllerDialog
Rather than using custom layout for MediaRouteControllerDialog, use
AlertDialog to lay out inner views and buttons properly. Also, obtain
the media route icon from the current theme and animate it if necessary.
Bug:
33253732
Test: Launched the dialog and verified.
Change-Id: I4bec689ce808285e084fc9a90820b429e63e765a
Nick Kralevich [Sun, 1 Jan 2017 23:08:31 +0000 (23:08 +0000)]
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am:
9156ccdbb4 am:
4400fb5bed am:
7099984f4c
am:
5a35ec90bf
Change-Id: Ia485c5cadc25a3e83a881132faacd6a0be104877
Nick Kralevich [Sun, 1 Jan 2017 22:59:55 +0000 (22:59 +0000)]
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am:
9156ccdbb4 am:
4400fb5bed
am:
7099984f4c
Change-Id: Ie88a0c43d9426c12319cc942015838e46d0bb8a1
Nick Kralevich [Sun, 1 Jan 2017 22:51:23 +0000 (22:51 +0000)]
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am:
9156ccdbb4
am:
4400fb5bed
Change-Id: I2d0f491b2f5f814aa92749a2f5d1130393cd1a83
Nick Kralevich [Sun, 1 Jan 2017 22:43:20 +0000 (22:43 +0000)]
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs"
am:
9156ccdbb4
Change-Id: I1501dce93ba090237831bf4c777cea13870f393d
Treehugger Robot [Sun, 1 Jan 2017 22:28:36 +0000 (22:28 +0000)]
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs"
TreeHugger Robot [Sat, 31 Dec 2016 04:09:58 +0000 (04:09 +0000)]
Merge "Fix getLineExtent for hyphen width."
Ivan Podogov [Fri, 30 Dec 2016 23:22:36 +0000 (23:22 +0000)]
Fix profiles broken by ag/
1751147 am:
5297dba712 am:
72d9008700
am:
0ad19476cb
Change-Id: I6e69bac35f1d3ec78b64287f4faa86103357e136
Ivan Podogov [Fri, 30 Dec 2016 23:15:00 +0000 (23:15 +0000)]
Fix profiles broken by ag/
1751147 am:
5297dba712
am:
72d9008700
Change-Id: Ic4760a5c931bf6b8340e9ebc96b08fec938d2421
Ivan Podogov [Fri, 30 Dec 2016 23:07:32 +0000 (23:07 +0000)]
Fix profiles broken by ag/
1751147
am:
5297dba712
Change-Id: I9c0a4ead26f60b601847c1ba73e6b492a3611880
Ivan Podogov [Fri, 30 Dec 2016 14:35:09 +0000 (14:35 +0000)]
Fix profiles broken by ag/
1751147
Change-Id: Ifa92819df8e63355a3979ea0f1a20a0363b6cd45
Martijn Coenen [Fri, 30 Dec 2016 13:01:14 +0000 (13:01 +0000)]
Merge "Remove obsolete calls to IPCThreadState/ProcessState."
Bill Yi [Fri, 30 Dec 2016 10:48:22 +0000 (10:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
7ad5111905 -s ours
am:
1efc31d6a6 -s ours
Change-Id: I8a050bf598ec6de7a6d0138bba5bf0dd313821b3
Bill Yi [Fri, 30 Dec 2016 10:47:16 +0000 (10:47 +0000)]
Import translations. DO NOT MERGE am:
9ab6fa68cf -s ours
am:
f4822f1045 -s ours
Change-Id: Idaa57f558ae4bd4ea7286d9f39626aa47a3c0737
Bill Yi [Fri, 30 Dec 2016 10:46:15 +0000 (10:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
54c62db71b -s ours
am:
3b16104048 -s ours
Change-Id: I664ce258c449ded2c4cb2f399c08f4a746ea4d00
Bill Yi [Fri, 30 Dec 2016 10:43:14 +0000 (10:43 +0000)]
Import translations. DO NOT MERGE am:
84cd5cbca0 -s ours
am:
5eba8f8978 -s ours
Change-Id: I4fc286b2adfdf79b5f13bf4c318ad0d895e0ee6f
Bill Yi [Fri, 30 Dec 2016 10:30:45 +0000 (10:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
7ad5111905 -s ours
Change-Id: I486d8669bdf005a5d9e9864cc22a3cbb9406d03c
Bill Yi [Fri, 30 Dec 2016 10:30:41 +0000 (10:30 +0000)]
Import translations. DO NOT MERGE
am:
9ab6fa68cf -s ours
Change-Id: Id16fd88bbc5e818a450da694558961077b2c3520
Bill Yi [Fri, 30 Dec 2016 10:29:00 +0000 (10:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
54c62db71b -s ours
Change-Id: I891c8e0150f073696f2c62d4514b5d94bae250a8
Bill Yi [Fri, 30 Dec 2016 10:28:55 +0000 (10:28 +0000)]
Import translations. DO NOT MERGE
am:
84cd5cbca0 -s ours
Change-Id: I551ce75f7294003f492f884b905b0da75d904ad7
TreeHugger Robot [Fri, 30 Dec 2016 10:21:16 +0000 (10:21 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 30 Dec 2016 10:20:29 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 30 Dec 2016 10:20:00 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 30 Dec 2016 10:19:34 +0000 (10:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 30 Dec 2016 10:11:19 +0000 (10:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Fri, 30 Dec 2016 08:22:37 +0000 (00:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3aeecfcbcf1a8c6c0cb1ca92982ac43ec4d87480
Auto-generated-cl: translation import
Bill Yi [Fri, 30 Dec 2016 05:29:31 +0000 (21:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iaff41f85806a9f7041ddb069130afc741300151a
Auto-generated-cl: translation import
Bill Yi [Fri, 30 Dec 2016 05:20:35 +0000 (21:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ied8ca4b5bbae1d9092a6df5acade12feb7d25517
Auto-generated-cl: translation import
Bill Yi [Fri, 30 Dec 2016 04:26:33 +0000 (20:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3258f0d63f194f3dbea148e5b4d94483d3fa0514
Auto-generated-cl: translation import
Bill Yi [Fri, 30 Dec 2016 04:03:02 +0000 (20:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I04e28a1f58f5ae00b8ba6e5187a7319d25157302
Auto-generated-cl: translation import
Rob Carr [Fri, 30 Dec 2016 02:01:52 +0000 (02:01 +0000)]
Merge "Do not wait for configuration when it won't change."
Robert Carr [Thu, 29 Dec 2016 23:58:14 +0000 (15:58 -0800)]
Do not wait for configuration when it won't change.
When updating orientation the configuration won't change
if we are rotating 180 degrees. It seems previously there were
redundant calls to setNewConfiguration et. al. clearing this flag.
Those aren't happening anymore, so it doesn't get cleared, leaving
the screen frozen.
Test: Manual repro of bug steps.
Bug:
33956442
Change-Id: I01c612a6d7f920ad7abf64aa97558bebde6bb49c
Jiaquan He [Fri, 30 Dec 2016 01:55:50 +0000 (01:55 +0000)]
Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev am:
e606e999a7
am:
0ca3a65ffd
Change-Id: Iec66672797b99467c94694fe9620db8ce8cc967e
Jiaquan He [Fri, 30 Dec 2016 01:54:38 +0000 (01:54 +0000)]
Cut the Grid-based Recents title if it's too long. am:
8f34df423d
am:
e7d2311593
Change-Id: I91f090f72790bf77480a4bd393c1e1bf1c1ff8ca
Jiaquan He [Fri, 30 Dec 2016 01:23:54 +0000 (01:23 +0000)]
Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev
am:
e606e999a7
Change-Id: I41ad3efd4d06cbf60d517889d3cbb38eb6db5aef
Jiaquan He [Fri, 30 Dec 2016 01:23:48 +0000 (01:23 +0000)]
Cut the Grid-based Recents title if it's too long.
am:
8f34df423d
Change-Id: I941f6d96bd6dab4c3bf6c09e5dbf4b136407a055
TreeHugger Robot [Fri, 30 Dec 2016 00:35:33 +0000 (00:35 +0000)]
Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev
Marie Janssen [Fri, 30 Dec 2016 00:20:43 +0000 (16:20 -0800)]
resolve merge conflicts of
825d8ff to master
Change-Id: I57ae47778f738dbea6a670b85f24161cfb544a16
Marie Janssen [Thu, 29 Dec 2016 23:45:39 +0000 (23:45 +0000)]
resolve merge conflicts of
c816141 to nyc-mr1-dev-plus-aosp
am:
07e590a574
Change-Id: I49fd2c3ed7ac5cbdf102ec289235b1fb12bee39a
TreeHugger Robot [Thu, 29 Dec 2016 23:08:19 +0000 (23:08 +0000)]
Merge "Don't allow permission change to runtime"
Eugene Susla [Thu, 29 Dec 2016 22:51:11 +0000 (22:51 +0000)]
Merge "Always propagate AccessibilityCache events"
Jean-Michel Trivi [Thu, 29 Dec 2016 22:24:46 +0000 (22:24 +0000)]
Merge "New AudioAttributes usage for "assistant" use case"
Marie Janssen [Thu, 29 Dec 2016 22:05:47 +0000 (14:05 -0800)]
resolve merge conflicts of
c816141 to nyc-mr1-dev-plus-aosp
Change-Id: I42e00b90165220d88519771b8f4280aaf3a07525
Svetoslav Ganov [Thu, 29 Dec 2016 18:39:02 +0000 (10:39 -0800)]
Don't allow permission change to runtime
Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.
Test: Added a CTS test which passes.
bug:
33860747
Change-Id: Icd2d596d42ae2c6cf569c016d20d9bb9106a29ef
Eugene Susla [Wed, 21 Dec 2016 00:32:59 +0000 (16:32 -0800)]
Always propagate AccessibilityCache events
Bug: b/
32642665
Test: Steps:
- Retrieve root AccessibilityNodeInfo
- Change text on its child TextView
- Wait for a few seconds to let the AccessibilityEvent propagate to
the AccessibilityCache
- Get the child AccessibilityNodeInfo from the root, corresponding to
that TextView, and ensure that it's updated to reflect the text
change
Change-Id: Icbdb91803b646fa06aaf11996d350f6f65c1e809
Marie Janssen [Thu, 29 Dec 2016 20:16:34 +0000 (12:16 -0800)]
resolve merge conflicts of
9cc7ebe to stage-aosp-master
Change-Id: Ia1cdf49d77a574c38ed5cc33c31d5cf930103484
TreeHugger Robot [Thu, 29 Dec 2016 20:29:41 +0000 (20:29 +0000)]
Merge "Disallow entering PiP without dismissing keyguard."
Ivan Podogov [Thu, 29 Dec 2016 20:10:00 +0000 (20:10 +0000)]
Merge changes from topic 'HID-Client' am:
8a74d0440c am:
59d63e8b1d am:
e11c3f6657
am:
c7fad3b056
Change-Id: Id6695de96ad887fa979b5ffa89d42b44890cd96e
Jean-Michel Trivi [Thu, 29 Dec 2016 18:33:29 +0000 (10:33 -0800)]
New AudioAttributes usage for "assistant" use case
Define USAGE_ASSISTANT for new use cases involving audio help,
query responses and more.
Test: make offline-sdk-docs
Bug:
30947943
Change-Id: Idf93ce4c0f014dbc9b491244cbad9e643cc03413
Ivan Podogov [Thu, 29 Dec 2016 20:08:38 +0000 (20:08 +0000)]
Rename the Bluetooth profile classes for HID Device role. am:
0afe190af5 am:
94e3d3f499 am:
91ab2e2f98
am:
48738f5ad0
Change-Id: I15651c5a6e3baf53d915626ea6c55180fefe28b5
Hemant Gupta [Thu, 29 Dec 2016 20:07:51 +0000 (20:07 +0000)]
Bluetooth: Add support for HID Device Role am:
e88fd4b594 am:
ee469c6fe9 am:
1ee22b7f70
am:
a9c92c2442
Change-Id: I56625e00b1b6c2b7b11e4ce4dc3038072ef6c231
Ivan Podogov [Thu, 29 Dec 2016 20:00:52 +0000 (20:00 +0000)]
Merge changes from topic 'HID-Client' am:
8a74d0440c am:
59d63e8b1d
am:
e11c3f6657
Change-Id: Ie63297ebe01de04c6e40c2ddae616c8d5c70a025
Ivan Podogov [Thu, 29 Dec 2016 20:00:09 +0000 (20:00 +0000)]
Rename the Bluetooth profile classes for HID Device role. am:
0afe190af5 am:
94e3d3f499
am:
91ab2e2f98
Change-Id: If0e072e96491020191a7742928cc90adff151342
Hemant Gupta [Thu, 29 Dec 2016 19:59:28 +0000 (19:59 +0000)]
Bluetooth: Add support for HID Device Role am:
e88fd4b594 am:
ee469c6fe9
am:
1ee22b7f70
Change-Id: Ia82f834d4d2ad800574bb0317f4fb3b3786972fc
Shahriyar Amini [Thu, 29 Dec 2016 19:56:26 +0000 (19:56 +0000)]
Merge "Make methods for Tile content provider data public."
Ivan Podogov [Thu, 29 Dec 2016 19:47:47 +0000 (19:47 +0000)]
Merge changes from topic 'HID-Client' am:
8a74d0440c
am:
59d63e8b1d
Change-Id: I73dc7aa098c0a4cb4c58371088c2aa0661ecdc41
Ivan Podogov [Thu, 29 Dec 2016 19:46:55 +0000 (19:46 +0000)]
Rename the Bluetooth profile classes for HID Device role. am:
0afe190af5
am:
94e3d3f499
Change-Id: I97ff93fd2564bd76d90095f8086f79c6c6086aff
Hemant Gupta [Thu, 29 Dec 2016 19:46:08 +0000 (19:46 +0000)]
Bluetooth: Add support for HID Device Role am:
e88fd4b594
am:
ee469c6fe9
Change-Id: Ic48911d254671d402f5a6b8198109f28e6497036
Ivan Podogov [Thu, 29 Dec 2016 19:39:07 +0000 (19:39 +0000)]
Merge changes from topic 'HID-Client'
am:
8a74d0440c
Change-Id: I6a541011024253f7b7f5f5207294cf1bce60a4f0
Ivan Podogov [Thu, 29 Dec 2016 19:38:41 +0000 (19:38 +0000)]
Rename the Bluetooth profile classes for HID Device role.
am:
0afe190af5
Change-Id: Ib5c9b904da57048d719df504142edd3dab0e6ec3
Hemant Gupta [Thu, 29 Dec 2016 19:37:58 +0000 (19:37 +0000)]
Bluetooth: Add support for HID Device Role
am:
e88fd4b594
Change-Id: Ic2a82d5670ffbd3046766d73ed9b180546c59169
Marie Janssen [Thu, 29 Dec 2016 19:32:36 +0000 (19:32 +0000)]
Merge "Bluetooth: track enabling in dumpsys"
Treehugger Robot [Thu, 29 Dec 2016 19:29:16 +0000 (19:29 +0000)]
Merge changes from topic 'HID-Client'
* changes:
Rename the Bluetooth profile classes for HID Device role.
Bluetooth: Add support for HID Device Role
Marie Janssen [Wed, 28 Dec 2016 22:13:21 +0000 (14:13 -0800)]
Bluetooth: track enabling in dumpsys
Move basic state dumpsys to here from AdapterService.
Track which apps are enabling and disabling Bluetooth, including BLE
apps, and show the apps in the dumpsys logs.
Test: start phone and enable/disable, take bug report
Bug:
33692282
Change-Id: I6ea62ebdcfd7873d0be1bb5c5c520bbce3737a40
Winson Chung [Sat, 17 Dec 2016 01:05:01 +0000 (17:05 -0800)]
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
Svetoslav Ganov [Thu, 29 Dec 2016 18:26:02 +0000 (18:26 +0000)]
Merge "Revert "Don't allow permission change to runtime""
Svetoslav Ganov [Thu, 29 Dec 2016 18:25:27 +0000 (18:25 +0000)]
Revert "Don't allow permission change to runtime"
This reverts commit
0f929c53201264da0ae908e349c904f2fa930e29.
Change-Id: I1b86461e352a6a2cf3d32748e06c7d5806937667
Geoffrey Pitsch [Thu, 29 Dec 2016 15:36:53 +0000 (15:36 +0000)]
Merge "Change Notification Inline Settings for Channels"
Martijn Coenen [Thu, 29 Dec 2016 13:00:19 +0000 (14:00 +0100)]
Remove obsolete calls to IPCThreadState/ProcessState.
Threadpools are started automatically, if necessary.
Bug:
31226656
Test: mma
Change-Id: Ib3542ee6f1530ee9c08eb7e9608db741d2c1560d
Ivan Podogov [Fri, 23 Dec 2016 11:52:21 +0000 (11:52 +0000)]
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
Hemant Gupta [Fri, 18 Apr 2014 05:52:45 +0000 (11:22 +0530)]
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
Tony Mak [Thu, 22 Dec 2016 11:02:45 +0000 (11:02 +0000)]
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
Charles He [Thu, 29 Dec 2016 12:51:54 +0000 (12:51 +0000)]
Remove duplicate lines due to automerger
Test: make
Bug:
30352311
Change-Id: Ic476be8fca733414589202701fe91e5eb47e97fb
Selim Cinek [Thu, 29 Dec 2016 12:26:40 +0000 (12:26 +0000)]
Merge "Improved the behavior with the empty shade view"
Selim Cinek [Thu, 29 Dec 2016 12:26:03 +0000 (12:26 +0000)]
Merge "Fixed a bug where notifications could stay expanded"
Charles He [Thu, 29 Dec 2016 11:58:01 +0000 (11:58 +0000)]
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
Change-Id: I6ceee43b87307b384cc3b6632b23d3859afa770a
Charles He [Thu, 29 Dec 2016 11:57:50 +0000 (11:57 +0000)]
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
Change-Id: I9e54ff0a37fc111c993d9db073f3fe7fbf0f5488
Charles He [Thu, 29 Dec 2016 11:56:00 +0000 (11:56 +0000)]
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
Change-Id: I25deb2a809f93e6c556f5219facc957254dd1488
Charles He [Thu, 29 Dec 2016 11:55:48 +0000 (11:55 +0000)]
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
Change-Id: I9c3ea23206e3d42fe32f3b5091093b51431d4611
Charles He [Thu, 29 Dec 2016 11:53:47 +0000 (11:53 +0000)]
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
Change-Id: Ic1496b88e823f14497f21bf86ff16543cb201440
Charles He [Thu, 29 Dec 2016 11:53:36 +0000 (11:53 +0000)]
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
Change-Id: I5136cccc00c7c38781da51eee549c74be01efef3
Charles He [Thu, 29 Dec 2016 11:51:43 +0000 (11:51 +0000)]
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
Change-Id: I0dd2ac558534b27371690c7b5f703ec27effeb93
Charles He [Thu, 29 Dec 2016 11:51:30 +0000 (11:51 +0000)]
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
Change-Id: I7dc971d31d61d49bbe2c2031ef336176cc9b3eae
Charles He [Thu, 29 Dec 2016 11:49:33 +0000 (11:49 +0000)]
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
Change-Id: I3a42d21df986dbaac5adb082d3bb85300461c15c
Charles He [Thu, 29 Dec 2016 11:49:21 +0000 (11:49 +0000)]
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
Change-Id: Ie48ff56d0cd0a6981b2a38734df22a79fee72643
Charles He [Thu, 29 Dec 2016 11:43:45 +0000 (11:43 +0000)]
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
Change-Id: I0807ac49f3512299f684825e7383d2d6db01c8c2
Charles He [Thu, 29 Dec 2016 11:43:34 +0000 (11:43 +0000)]
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
Change-Id: I84c3e798f88439514d0faeaf0937d2648e07ee2e
Charles He [Thu, 29 Dec 2016 11:38:41 +0000 (11:38 +0000)]
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
Change-Id: Icba07b2f411be7aa7e75b68a595378334476e4f6
Charles He [Thu, 29 Dec 2016 11:38:32 +0000 (11:38 +0000)]
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
Change-Id: Ie906f7470d28a32e1f3cb3fcd1918f3ad47fe5e1
Charles He [Thu, 29 Dec 2016 11:37:01 +0000 (11:37 +0000)]
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
Change-Id: I87a2d4fbeed47094cc27967b13e1950b3dedaf0e
Android Build Merger (Role) [Thu, 29 Dec 2016 11:28:46 +0000 (11:28 +0000)]
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
Android Build Merger (Role) [Thu, 29 Dec 2016 11:28:20 +0000 (11:28 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:28:03 +0000 (11:28 +0000)]
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
Change-Id: Ia8f46f37277c4b2377cc232bb5879b815f221064
Charles He [Thu, 29 Dec 2016 11:27:37 +0000 (11:27 +0000)]
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
Change-Id: I46f642c19a517e64ce46a02d5235e766eb1897be
Android Build Merger (Role) [Thu, 29 Dec 2016 11:27:34 +0000 (11:27 +0000)]
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
OSDN Git Service
