OSDN Git Service
Marie Janssen [Tue, 3 Jan 2017 20:28:01 +0000 (20:28 +0000)]
Bluetooth: track enabling in dumpsys
am:
a50cc71471
Change-Id: Ifacdcb4c28d6a3a5b745434e1f6ae83c3688f7a9
Jeff Sharkey [Tue, 3 Jan 2017 19:48:36 +0000 (19:48 +0000)]
Merge "Offer to measure disk stats using quotas." am:
f8720b95be am:
4b80a4a372
am:
1e1cdbead1
Change-Id: Ic00acfb0efb6188a15357322528075d41467310b
Robert Greenwalt [Tue, 3 Jan 2017 19:35:37 +0000 (11:35 -0800)]
resolve merge conflicts of
e6b6653da899 to nyc-mr2-dev-plus-aosp
Change-Id: Ifbbe0d2758ab25aee7001412f71b0445c62cbdac
Jeff Sharkey [Tue, 3 Jan 2017 19:31:36 +0000 (19:31 +0000)]
Merge "Offer to measure disk stats using quotas." am:
f8720b95be
am:
4b80a4a372
Change-Id: I2ab9a2bd2ff60cafea332998789ad947dda0140b
Jeff Sharkey [Tue, 3 Jan 2017 19:24:00 +0000 (19:24 +0000)]
Merge "Offer to measure disk stats using quotas."
am:
f8720b95be
Change-Id: I56bab3ec4895c232ce8287623827c20f2dbfaaf6
Jeff Sharkey [Tue, 3 Jan 2017 19:08:07 +0000 (19:08 +0000)]
Merge "Offer to measure disk stats using quotas."
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
(cherry picked from commit
5980456040217f330289e3fa59df4efaafb1c6c5)
Robert Greenwalt [Tue, 3 Jan 2017 17:40:27 +0000 (17:40 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause" am:
43ced5941e
am:
14a5b810b6
Change-Id: Ib7a87a5028975e8f55dd6ba311cde78a3c1c2460
Robert Greenwalt [Tue, 3 Jan 2017 17:32:59 +0000 (17:32 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
am:
43ced5941e
Change-Id: I5457b80932f4bb155bf136fc4e05199f04ca7e7c
Robert Greenwalt [Tue, 3 Jan 2017 17:26:58 +0000 (17:26 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
Jeff Sharkey [Tue, 13 Dec 2016 15:44:51 +0000 (08:44 -0700)]
Offer to measure disk stats using quotas.
Now we're getting somewhere! This CL starts measuring disk usage
using quotactl(), which is almost instant and has much lower impact
on flash memory lifetime.
We now grant the per-app cache GID to every launched app, and the
ContextImpl logic that creates cache directories matches the logic
down in installd.
Test: builds, boots, quota stats match manual stats
Bug:
27948817
Change-Id: Ie269a2958ce0e1c17cb74dbfecc791a5c12922cf
dongwan0605.kim [Tue, 3 Jan 2017 16:27:27 +0000 (16:27 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page" am:
fce04dc0be am:
56812a0146
am:
852fb2b1f1
Change-Id: Ide5e7c588eb1707015ac33a13fb9788e80617587
dongwan0605.kim [Tue, 3 Jan 2017 16:17:28 +0000 (16:17 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page" am:
fce04dc0be
am:
56812a0146
Change-Id: If8d2963ed44e49e3b33b73a82378b2af32ba4676
dongwan0605.kim [Tue, 3 Jan 2017 16:09:21 +0000 (16:09 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page"
am:
fce04dc0be
Change-Id: I83100ac5c1f4d896d96d2ff12d0ad59eba8b533b
Treehugger Robot [Tue, 3 Jan 2017 15:54:21 +0000 (15:54 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page"
Android Build Merger (Role) [Tue, 3 Jan 2017 11:18:33 +0000 (11:18 +0000)]
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am:
34624a5d83 am:
2dd60e81ad" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 3 Jan 2017 11:18:25 +0000 (11:18 +0000)]
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am:
34624a5d83 am:
57f7c2db57" into nyc-mr2-dev-plus-aosp
Ivan Podogov [Tue, 3 Jan 2017 11:17:45 +0000 (11:17 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am:
34624a5d83
am:
2dd60e81ad
Change-Id: Ie0b2f16368d5d6d1d12a140bf57049ae29c7b84f
Ivan Podogov [Tue, 3 Jan 2017 11:17:39 +0000 (11:17 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am:
34624a5d83
am:
57f7c2db57
Change-Id: If36ef6f3fd072fa5ac0593584b499e050d30d4dc
Android Build Merger (Role) [Tue, 3 Jan 2017 11:17:22 +0000 (11:17 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT. am:
d2d32b1f32 am:
0368be4523" into nyc-mr2-dev-plus-aosp
Ivan Podogov [Tue, 3 Jan 2017 11:16:31 +0000 (11:16 +0000)]
In permission review mode, always request user's consent to toggle BT. am:
d2d32b1f32
am:
0368be4523
Change-Id: I677252c7b488637ca1b24595b9d5dba09d77b06b
Ivan Podogov [Tue, 3 Jan 2017 11:16:31 +0000 (11:16 +0000)]
In permission review mode, always request user's consent to toggle BT. am:
d2d32b1f32
am:
41f3188f73
Change-Id: Iab790f80b2ca9c810bb6f1d15783ab48d0f04569
Ivan Podogov [Tue, 3 Jan 2017 11:08:39 +0000 (11:08 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
am:
34624a5d83
Change-Id: I43d92809b076e64ac0677303977c2950b556734b
Ivan Podogov [Tue, 3 Jan 2017 11:08:32 +0000 (11:08 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
am:
34624a5d83
Change-Id: If251197924b6f2f7b1970c614b5ceccc70edef4a
Ivan Podogov [Tue, 3 Jan 2017 11:08:32 +0000 (11:08 +0000)]
In permission review mode, always request user's consent to toggle BT.
am:
d2d32b1f32
Change-Id: I85808eba60ad76b7492803c2cca643161521067a
Ivan Podogov [Tue, 3 Jan 2017 11:08:29 +0000 (11:08 +0000)]
In permission review mode, always request user's consent to toggle BT.
am:
d2d32b1f32
Change-Id: I89a4c24cf0bd4154ca87f04e41b2cc64c49b39b2
Ivan Podogov [Tue, 3 Jan 2017 11:00:49 +0000 (11:00 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
dongwan0605.kim [Tue, 3 Jan 2017 06:40:07 +0000 (15:40 +0900)]
QS: Fix QuickQS visibility at non-first page
When user collapsed QSPanel at non-first page, QuickQS always remained
View.Visible. When user canceled collapsing, QQS remained clickable
although invisible to user(alpha = 0).
QQS must be non-clickable when user cancels collapsing at non-first page.
Test: QSPanel > 2nd page > Cancel collapsing while collapse QSPanel
> Verify invisible QQS is non-clickable
Change-Id: I4c1f195a3faec8e89bb073443f6345f4faddf781
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"
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
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: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
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
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 [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
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
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
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
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
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
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
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
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:06 +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:
fdcec75c74" into nyc-mr2-dev-plus-aosp
Charles He [Thu, 29 Dec 2016 11:26:50 +0000 (11:26 +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
Change-Id: I426adb43d8d1eabaf58fc70b9a4880fa93a813c1
Charles He [Thu, 29 Dec 2016 11:26:23 +0000 (11:26 +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
Change-Id: Ie3b37d91d938d3b6f11ee9fa4d909671340150ca
Android Build Merger (Role) [Thu, 29 Dec 2016 11:26:18 +0000 (11:26 +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
Android Build Merger (Role) [Thu, 29 Dec 2016 11:25:55 +0000 (11:25 +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
Charles He [Thu, 29 Dec 2016 11:25:28 +0000 (11:25 +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
Change-Id: Icbad7a4d6c1fd66e94f132ad39b9de6763988e2a
Charles He [Thu, 29 Dec 2016 11:25:11 +0000 (11:25 +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
Change-Id: I036d794b37bad0418f0f667c33d09e605df9f69b
Android Build Merger (Role) [Thu, 29 Dec 2016 11:24:59 +0000 (11:24 +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
Charles He [Thu, 29 Dec 2016 11:24:10 +0000 (11:24 +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
Change-Id: I630b97aa9b3a5e9bbc88b49aeb61216ff9c37de6
Charles He [Thu, 29 Dec 2016 11:23:57 +0000 (11:23 +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
Change-Id: Ic6182836cbc0bf547bcd6c6621a410c1e6d0ce8f
Charles He [Thu, 29 Dec 2016 11:20:39 +0000 (11:20 +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
Change-Id: Ic735b56728a9e8f8df25c22ed33135890e8b6f08
Charles He [Thu, 29 Dec 2016 11:20:16 +0000 (11:20 +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
Change-Id: I3dab3f81346bd13b1ae343dd6e21a437b642a080
Charles He [Thu, 29 Dec 2016 11:19:27 +0000 (11:19 +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
Change-Id: I4223d7df9ecdf7c39401fcaa9e7ec5b2ed3253a4
Charles He [Thu, 29 Dec 2016 11:19:07 +0000 (11:19 +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
Change-Id: I9c159162e18af0820c76d42c22e2ec001ab72c62
Charles He [Thu, 29 Dec 2016 11:18:16 +0000 (11:18 +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
Change-Id: Id728f54d83459d4a583a4b639529308667fd7f8e
Charles He [Thu, 29 Dec 2016 11:18:04 +0000 (11:18 +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
Change-Id: I85ff02b53d1285d8e8a4e7c30ae9a988c52d6468
Charles He [Thu, 29 Dec 2016 11:17:05 +0000 (11:17 +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
Change-Id: I1526deabd38ef8ecbb841a7029b9539bb5f3aefc
Charles He [Thu, 29 Dec 2016 11:16:55 +0000 (11:16 +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
Change-Id: I079501cac553468878a6642a64110f4de3e56698
Ivan Podogov [Thu, 29 Dec 2016 11:16:50 +0000 (11:16 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." am:
895e2d7a40 -s ours am:
fd770e1cb8
am:
b90fa0a5c3
Change-Id: Id527fe8b5242ae6650446ce2993708463c08323b
Ivan Podogov [Thu, 29 Dec 2016 11:10:29 +0000 (11:10 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." am:
895e2d7a40 -s ours
am:
fd770e1cb8
Change-Id: Icef54e7756a1b9b63f909ea8011a2625df38df99
Charles He [Thu, 29 Dec 2016 11:06:56 +0000 (11:06 +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
Change-Id: If8e61075126f4b8a5ccf5a29e2bd74fec222f2f6
Charles He [Thu, 29 Dec 2016 11:05:43 +0000 (11:05 +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
Change-Id: Iff7b172dafedff0dcca720c4e7ca1c16e8c6a35c
Charles He [Thu, 29 Dec 2016 11:04:37 +0000 (11:04 +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
Change-Id: Ia49ac04fb87b215fc52b0dd40d917f2aab045745
Charles He [Thu, 29 Dec 2016 11:03:26 +0000 (11:03 +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
Change-Id: I7e5794885bf78dfd1d755a7fdb0b1edf66b9fdee
Ivan Podogov [Thu, 29 Dec 2016 11:03:21 +0000 (11:03 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT."
am:
895e2d7a40 -s ours
Change-Id: Id2deabb5875b0ca13bb818a7c65893e01dc655e2
Charles He [Thu, 29 Dec 2016 10:58:44 +0000 (10:58 +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
Change-Id: I5fc69e1d8e02e405ae9ca8362a5c1f6312b4f53e
Charles He [Thu, 29 Dec 2016 10:57:41 +0000 (10:57 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089 am:
ced5ab190c am:
3cc7f6acdc
am:
e426dac4e2
Change-Id: I6451344efe089a7ff5de2082a9b8b77661c49ab7
Charles He [Thu, 29 Dec 2016 10:56:32 +0000 (10:56 +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
Change-Id: I8426e0788ce1dcb12daac23e82663284633cae5b
Charles He [Thu, 29 Dec 2016 10:55:23 +0000 (10:55 +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
Change-Id: I2124f52b38314199950d1448cddd2bbd328c85ce
Charles He [Thu, 29 Dec 2016 10:44:41 +0000 (10:44 +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
Change-Id: I02047ef2536a6a77df84e1b203d3b5ee55439e32
Charles He [Thu, 29 Dec 2016 10:43:40 +0000 (10:43 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089 am:
ced5ab190c
am:
3cc7f6acdc
Change-Id: I98e65fcf8180e5187a92e8d5b888eb794f89ab6d
Charles He [Thu, 29 Dec 2016 10:42:32 +0000 (10:42 +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
Change-Id: I8f10fcf6b604848f68ecc086dd3723841e07ef8c
OSDN Git Service
