Wei Wang
|
7e6dea0fab
|
Merge "Remove bg_non_interactive cgroup [ DO NOT MERGE ]" into nyc-mr2-dev
|
2017-03-23 21:18:49 +00:00 |
|
Wei Wang
|
f2d2640895
|
Remove bg_non_interactive cgroup [ DO NOT MERGE ]
Bug: 34193533
Test: mma
Change-Id: I0d255f47eaded15eda02a4654193a4e49c63a2c5
|
2017-03-21 23:35:38 +00:00 |
|
Calvin On
|
9a80c1799c
|
Remove the now-empty WearBluetoothService from SystemServer
am: 3bcc688bce
Change-Id: Id95770faa65878282d9b49c01fad258b8eb57c06
|
2017-03-21 20:18:59 +00:00 |
|
Calvin On
|
3bcc688bce
|
Remove the now-empty WearBluetoothService from SystemServer
Change-Id: I7ddf213fa90acf84a50a53e7666311132b6b3922
|
2017-03-17 14:19:29 -07:00 |
|
Andrew Zeng
|
a01e2212c8
|
Merge "Fix NPE in LockSettingsService." into cw-f-dev
am: 4aff3d53ef
Change-Id: I17880622c489df79eeea5116b3afe3c462b06554
|
2017-03-16 23:22:05 +00:00 |
|
Andrew Zeng
|
4aff3d53ef
|
Merge "Fix NPE in LockSettingsService." into cw-f-dev
|
2017-03-16 23:03:06 +00:00 |
|
Andrew Zeng
|
750563ee50
|
Fix NPE in LockSettingsService.
Bug: 33789922
Change-Id: Iecdedd8d73d9f749f15a64131cc894d9f92de9d1
|
2017-03-15 13:17:10 -07:00 |
|
Marie Janssen
|
4b39c15da0
|
Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am: 4034a9a96a am: 89d2b46a4a
am: c1a5939026
Change-Id: I50df57c208542d35bc72851fa37e47731bbd9965
|
2017-03-14 19:29:50 +00:00 |
|
Marie Janssen
|
c1a5939026
|
Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am: 4034a9a96a
am: 89d2b46a4a
Change-Id: I5f710900167558283cb9e898c2022d8991dbb5c3
|
2017-03-14 19:21:49 +00:00 |
|
Marie Janssen
|
89d2b46a4a
|
Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c
am: 4034a9a96a
Change-Id: Ie63f9d24ab37c5465b250d2b9b60efdf736b4d60
|
2017-03-14 19:16:47 +00:00 |
|
Marie Janssen
|
4034a9a96a
|
Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c
Change-Id: I2b9aeca138aefb0579b3be8014b3f0bf49d99764
|
2017-03-14 10:09:52 -07:00 |
|
Marie Janssen
|
faf4070883
|
Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-dev
|
2017-03-14 16:01:12 +00:00 |
|
Kenny Guy
|
d49386eaa5
|
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0
am: 11c5ff0399
Change-Id: I649c06ea01b23db5668fa0694528cffd823b8d7b
|
2017-03-14 12:21:00 +00:00 |
|
Kenny Guy
|
11c5ff0399
|
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3
am: 00b77edec0
Change-Id: I16ea6b1c11cde1b9491826d7e95dc9bf3a45458b
|
2017-03-14 12:16:23 +00:00 |
|
Kenny Guy
|
00b77edec0
|
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0
am: c5d86736d3
Change-Id: I0886d46f74fec980eb8bd6c99d8b647e294bcb21
|
2017-03-14 12:11:54 +00:00 |
|
Kenny Guy
|
c5d86736d3
|
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev
am: 2df7f9f9c0
Change-Id: I9ca23aa395e0120413a60174e9b7ef44d91a90b1
|
2017-03-14 12:07:26 +00:00 |
|
Kenny Guy
|
2df7f9f9c0
|
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev
|
2017-03-14 12:01:57 +00:00 |
|
Fyodor Kupolov
|
aeb33eb0a8
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a am: ff5be765b1 am: 6ca67f067a
am: e385c8a0b9
Change-Id: I013ae3547aa049a19aae6840e9e80a4a361527e3
|
2017-03-10 04:12:42 +00:00 |
|
Fyodor Kupolov
|
e385c8a0b9
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a am: ff5be765b1
am: 6ca67f067a
Change-Id: Ibd38a2b0bd180180bb3812dedaf22ab07000aee9
|
2017-03-10 04:04:01 +00:00 |
|
Fyodor Kupolov
|
6ca67f067a
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a
am: ff5be765b1
Change-Id: I4fb68c79924a046a065f893b14877fb6d6e21632
|
2017-03-10 03:58:02 +00:00 |
|
Fyodor Kupolov
|
ff5be765b1
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours
am: 1fd70c201a
Change-Id: Ia89d648b7b9042781c41a8bb0ffa7a125b3f36d1
|
2017-03-10 03:48:47 +00:00 |
|
Fyodor Kupolov
|
1fd70c201a
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f
am: f7cde31747 -s ours
Change-Id: I801cd8c8e607f2c88edb26ea1947e650f128df4d
|
2017-03-10 03:40:12 +00:00 |
|
Fyodor Kupolov
|
f7cde31747
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4
am: f937aabb0f
Change-Id: I6c0bf6190e96b34b6995337a94c451b4b172c168
|
2017-03-10 03:34:38 +00:00 |
|
Fyodor Kupolov
|
f937aabb0f
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886
am: 9e2cf8e5c4
Change-Id: I4d447f67d293a1cc4a187d66496cb447612eebad
|
2017-03-10 03:28:56 +00:00 |
|
Fyodor Kupolov
|
9e2cf8e5c4
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours
am: aa0b718886
Change-Id: Ife44fe3b8b295901699de0043dba5bcdc06f32f3
|
2017-03-10 03:23:34 +00:00 |
|
Fyodor Kupolov
|
68b9522d45
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444 -s ours am: 9c4d89c55f am: a1aa5cb34a am: e3e01cc375
am: 6ce5879e11
Change-Id: Id25ccb2ef13e266090c5759e34dee8b93175402d
|
2017-03-10 03:20:10 +00:00 |
|
Fyodor Kupolov
|
aa0b718886
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2
am: 2411b4f774 -s ours
Change-Id: Ie78ad1a602d6502c09a98ee9e28119caab3534b7
|
2017-03-10 03:17:46 +00:00 |
|
Fyodor Kupolov
|
52a0172003
|
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0 -s ours am: 567e742daf am: 5a16e06272 am: 73ceabb948
am: e2aeaa9998
Change-Id: I4b07cb2d90fc1af523a3b91817f18ec1e99100fc
|
2017-03-10 03:15:52 +00:00 |
|
Fyodor Kupolov
|
2411b4f774
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours
am: 2c112c4ad2
Change-Id: Ic108a0750248d001873de33d69984e6cf2c3584a
|
2017-03-10 03:12:06 +00:00 |
|
Fyodor Kupolov
|
6ce5879e11
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444 -s ours am: 9c4d89c55f am: a1aa5cb34a
am: e3e01cc375
Change-Id: Ied0957306478565b83e6717659753ed53042248b
|
2017-03-10 03:11:33 +00:00 |
|
Fyodor Kupolov
|
e2aeaa9998
|
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0 -s ours am: 567e742daf am: 5a16e06272
am: 73ceabb948
Change-Id: I3b68d137a93d8d35c08878b486924c6c0e824327
|
2017-03-10 03:07:21 +00:00 |
|
Fyodor Kupolov
|
2c112c4ad2
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours
am: de9cb7ed68 -s ours
Change-Id: I2f94e2ea49c05a29308ca2351a083377350bb2ab
|
2017-03-10 03:06:31 +00:00 |
|
Fyodor Kupolov
|
e3e01cc375
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444 -s ours am: 9c4d89c55f
am: a1aa5cb34a
Change-Id: Idb8e058c25dc0f9fe9a1de880a6cb4f052a8729d
|
2017-03-10 03:03:03 +00:00 |
|
Fyodor Kupolov
|
de9cb7ed68
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70
am: 156fa32e2a -s ours
Change-Id: Ic4e51daa36c395f2e3b538658649ff9104bb962c
|
2017-03-10 03:00:46 +00:00 |
|
Fyodor Kupolov
|
73ceabb948
|
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0 -s ours am: 567e742daf
am: 5a16e06272
Change-Id: I314400073f43d720f74eac2e8f744b3768537f49
|
2017-03-10 02:59:41 +00:00 |
|
Fyodor Kupolov
|
a1aa5cb34a
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444 -s ours
am: 9c4d89c55f
Change-Id: Ief6c78fd5c3d281eae14928bd5572e0042cbc684
|
2017-03-10 02:55:29 +00:00 |
|
Fyodor Kupolov
|
156fa32e2a
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354
am: a821245d70
Change-Id: I1e47c963728906cb2283a353c882017368d07747
|
2017-03-10 02:55:07 +00:00 |
|
Fyodor Kupolov
|
c50e273b0a
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6 am: 48a36cdade -s ours am: e8fb34b44c am: c4054a8b7f am: 885acaff75
am: 4d1253afcc
Change-Id: I3e6bbbe56d17b61e31cfb673ac198ba5b4825992
|
2017-03-10 02:54:01 +00:00 |
|
Fyodor Kupolov
|
5a16e06272
|
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0 -s ours
am: 567e742daf
Change-Id: Iad3060ad58e0276c5125a54915f35e01eaa5babe
|
2017-03-10 02:50:38 +00:00 |
|
Fyodor Kupolov
|
a821245d70
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
am: ac87aee354
Change-Id: I5bbdc48120f2d03b4ad6605bfeccd5ccdc8c7958
|
2017-03-10 02:49:34 +00:00 |
|
Fyodor Kupolov
|
9c4d89c55f
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4
am: 1aaef53444 -s ours
Change-Id: I9a962db0db6c1e5369bc3e21b4b2f1c6a21dc2c6
|
2017-03-10 02:45:57 +00:00 |
|
Fyodor Kupolov
|
4d1253afcc
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6 am: 48a36cdade -s ours am: e8fb34b44c am: c4054a8b7f
am: 885acaff75
Change-Id: Ib675821a67fad6caf4875fa0de2a88b1f8c0ede1
|
2017-03-10 02:45:14 +00:00 |
|
Fyodor Kupolov
|
567e742daf
|
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0
am: 46dbe6a7d0 -s ours
Change-Id: I23d0261d2b1704528a4ea49c59785c9e35419d2b
|
2017-03-10 02:42:23 +00:00 |
|
Fyodor Kupolov
|
ac87aee354
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
|
2017-03-10 02:39:14 +00:00 |
|
Fyodor Kupolov
|
885acaff75
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6 am: 48a36cdade -s ours am: e8fb34b44c
am: c4054a8b7f
Change-Id: I6834bf86950b8e6889515fcf52e930301c99ca57
|
2017-03-10 02:39:11 +00:00 |
|
Fyodor Kupolov
|
1aaef53444
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9
am: bbb7ae05d4
Change-Id: Ia30782857bdbb6e05bc1e2b0e7c5d905509e2c5d
|
2017-03-10 02:37:52 +00:00 |
|
Fyodor Kupolov
|
9ef5a41923
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b am: 4130501c19 am: 3a8534f18e am: a74748d05e -s ours am: dd472080f0 am: 221088d6df am: cc484a5cdf
am: b091206f92
Change-Id: Ib889b5c4a2ae00618295f0a664a215429352ac57
|
2017-03-10 02:37:06 +00:00 |
|
Fyodor Kupolov
|
46dbe6a7d0
|
[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours am: 13df27e68b am: a3912b6a1b
am: 0766ba70c0
Change-Id: Iccf8ecd9b0a5571efe648416ffda156578aeb095
|
2017-03-10 02:34:06 +00:00 |
|
Fyodor Kupolov
|
c4054a8b7f
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6 am: 48a36cdade -s ours
am: e8fb34b44c
Change-Id: I1aead2d88b2af119492a62134c1b416792218227
|
2017-03-10 02:33:18 +00:00 |
|
Fyodor Kupolov
|
bbb7ae05d4
|
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25
am: ad386addb9
Change-Id: I80e715d7dc65b82d89249b163c2198e5c0561761
|
2017-03-10 02:30:29 +00:00 |
|