OSDN Git Service
Andres Morales [Wed, 16 Sep 2015 16:27:09 +0000 (16:27 +0000)]
am
8d9ba684: am
5b78fda9: am
38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
* commit '
8d9ba684982cb2e1d2d86e77484bc8772c8ff328':
reset lockout deadline on device reboot
Andres Morales [Wed, 16 Sep 2015 16:18:25 +0000 (16:18 +0000)]
am
5b78fda9: am
38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
* commit '
5b78fda91e33b4fc8de5f0a8ab894941202c42cb':
reset lockout deadline on device reboot
Andres Morales [Wed, 16 Sep 2015 16:12:03 +0000 (16:12 +0000)]
am
38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
* commit '
38e6e4ef98ea1f116902725c282df9fb061a224e':
reset lockout deadline on device reboot
Andres Morales [Wed, 16 Sep 2015 16:04:56 +0000 (16:04 +0000)]
Merge "reset lockout deadline on device reboot" into mnc-dr-dev
Zach Jang [Wed, 16 Sep 2015 02:45:37 +0000 (02:45 +0000)]
am
ea196888: am
e1ab0999: am
2b564bf4: am
716c6269: am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
ea196888a0a1a9c0e67aa809676a12a7d0cb955e':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:45:31 +0000 (02:45 +0000)]
am
d00737fc: am
eee9c2de: am
0098cbc0: am
971ff47c: am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
d00737fc72037d5af035108ef532edbc770c5039':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 02:32:04 +0000 (02:32 +0000)]
am
e1ab0999: am
2b564bf4: am
716c6269: am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
e1ab0999cdcb719480200ea6be71a60f58ce90f4':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:31:58 +0000 (02:31 +0000)]
am
eee9c2de: am
0098cbc0: am
971ff47c: am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
eee9c2de434f89764b66dbe9dc7c8169971e5228':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 02:25:32 +0000 (02:25 +0000)]
am
2b564bf4: am
716c6269: am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
2b564bf42a68370dc4d32acbb597cfb7c45f9f4f':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:25:28 +0000 (02:25 +0000)]
am
0098cbc0: am
971ff47c: am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
0098cbc011771d5ffdf93a3a4b7e6a0507e1725d':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 02:16:04 +0000 (02:16 +0000)]
am
716c6269: am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
716c6269674474867dc4720f86f739c639c83400':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:16:00 +0000 (02:16 +0000)]
am
971ff47c: am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
971ff47c75889a2fc4ac710fbe62ba819feeaba6':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 02:06:31 +0000 (02:06 +0000)]
am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
63348ae4572cd9394e79fe343d2fca2b38498d1c':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:06:26 +0000 (02:06 +0000)]
am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
1b06455e44395489dcd027a170e68eabf2ebe1da':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:56:57 +0000 (01:56 +0000)]
am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
11317e82cf561597bbd4e2dbf5840854e6b7a16d':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:56:52 +0000 (01:56 +0000)]
am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
00db0826561b23a54db28ed5203fd7eff79c16c7':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:44:58 +0000 (01:44 +0000)]
am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
32a420ea36fbae07484f6fcf718ed97865ca3158':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:44:53 +0000 (01:44 +0000)]
am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
203b43547da94c9fb78931680b99f9db49fc46c9':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:40:18 +0000 (01:40 +0000)]
Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
Zach Jang [Wed, 16 Sep 2015 01:38:41 +0000 (01:38 +0000)]
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
This reverts commit
3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.
Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
Zach Jang [Wed, 16 Sep 2015 01:37:36 +0000 (01:37 +0000)]
Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
Lorenzo Colitti [Wed, 16 Sep 2015 01:18:16 +0000 (01:18 +0000)]
am
5bc891c8: am
774adb03: am
7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev
* commit '
5bc891c8a8e81b8264b06794abc346e5da733c2b':
Framework fixes for RSSI offload.
Lorenzo Colitti [Wed, 16 Sep 2015 01:12:20 +0000 (01:12 +0000)]
am
774adb03: am
7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev
* commit '
774adb03a30e0203bf2f4da29907d463799c33c3':
Framework fixes for RSSI offload.
Lorenzo Colitti [Wed, 16 Sep 2015 01:01:05 +0000 (01:01 +0000)]
am
7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev
* commit '
7198c0aa4ccbeaecf2606006d3a6ace684f805fe':
Framework fixes for RSSI offload.
Lorenzo Colitti [Wed, 16 Sep 2015 00:54:57 +0000 (00:54 +0000)]
Merge "Framework fixes for RSSI offload." into mnc-dr-dev
Stephen Hines [Tue, 15 Sep 2015 23:21:36 +0000 (23:21 +0000)]
am
a13980ce: am
ce6b9db4: Merge "Update docs for RS object API fixes."
* commit '
a13980ceaa9c0774f7f360f82102213ae0110145':
Update docs for RS object API fixes.
Stephen Hines [Tue, 15 Sep 2015 23:09:59 +0000 (23:09 +0000)]
am
ce6b9db4: Merge "Update docs for RS object API fixes."
* commit '
ce6b9db498b67c8136a9267c2f87b432a5f22206':
Update docs for RS object API fixes.
Jim Miller [Tue, 15 Sep 2015 21:38:11 +0000 (21:38 +0000)]
am
f84e0535: am
0dd1163a: am
dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
* commit '
f84e0535aee45874cf022628c4959dd15c4b1bc5':
Add logging to track fingerprint reco but not unlocking
Guang Zhu [Tue, 15 Sep 2015 21:38:05 +0000 (21:38 +0000)]
am
8bc9238f: am
9e4a4606: am
fe74fb95: extend svc command to control NFC state
* commit '
8bc9238f1438c1c9359b3c8959399c0168dbfc74':
extend svc command to control NFC state
Svet Ganov [Tue, 15 Sep 2015 21:37:59 +0000 (21:37 +0000)]
am
4f5b020e: am
51491627: am
276da47a: am
cd946024: Default grant SMS and Phone to the verifier
* commit '
4f5b020e87df63c72562c50131ad2829b911f904':
Default grant SMS and Phone to the verifier
Filip Gruszczynski [Tue, 15 Sep 2015 21:37:52 +0000 (21:37 +0000)]
am
8d5f358d: am
41e13b0a: Update circular mask after display is ready.
* commit '
8d5f358dce44f64fcdde1b69261bbf18784a0d4a':
Update circular mask after display is ready.
Jim Miller [Tue, 15 Sep 2015 21:31:22 +0000 (21:31 +0000)]
am
0dd1163a: am
dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
* commit '
0dd1163af00f16bc0e8e07cb585d4c217df78af3':
Add logging to track fingerprint reco but not unlocking
Guang Zhu [Tue, 15 Sep 2015 21:31:16 +0000 (21:31 +0000)]
am
9e4a4606: am
fe74fb95: extend svc command to control NFC state
* commit '
9e4a4606b8ff1469b7fee96ba1daa220fe51b042':
extend svc command to control NFC state
Svet Ganov [Tue, 15 Sep 2015 21:31:09 +0000 (21:31 +0000)]
am
51491627: am
276da47a: am
cd946024: Default grant SMS and Phone to the verifier
* commit '
51491627f4f191959ff34d4cff85171c1fc4cb8f':
Default grant SMS and Phone to the verifier
Filip Gruszczynski [Tue, 15 Sep 2015 21:24:15 +0000 (21:24 +0000)]
am
41e13b0a: Update circular mask after display is ready.
* commit '
41e13b0a68e49648d2f58738880bc3d6f93201cf':
Update circular mask after display is ready.
Jim Miller [Tue, 15 Sep 2015 21:22:50 +0000 (21:22 +0000)]
am
dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
* commit '
dca3b2f74f7979e87e2654baf83df42483ef4388':
Add logging to track fingerprint reco but not unlocking
Guang Zhu [Tue, 15 Sep 2015 21:22:46 +0000 (21:22 +0000)]
am
fe74fb95: extend svc command to control NFC state
* commit '
fe74fb95b91a5d58a8d2d238c525e2f1891ca0c7':
extend svc command to control NFC state
Svet Ganov [Tue, 15 Sep 2015 21:22:41 +0000 (21:22 +0000)]
am
276da47a: am
cd946024: Default grant SMS and Phone to the verifier
* commit '
276da47adf23b5512985268f36fab0b7d2d11363':
Default grant SMS and Phone to the verifier
Stephen Hines [Tue, 15 Sep 2015 21:22:09 +0000 (21:22 +0000)]
Merge "Update docs for RS object API fixes."
Jim Miller [Tue, 15 Sep 2015 21:08:06 +0000 (21:08 +0000)]
Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
Guang Zhu [Mon, 14 Sep 2015 01:43:56 +0000 (18:43 -0700)]
extend svc command to control NFC state
Change-Id: I599e4000fa17384089410e63b3150f25aa9458f7
Filip Gruszczynski [Tue, 15 Sep 2015 20:17:44 +0000 (13:17 -0700)]
Update circular mask after display is ready.
This fixes the situation where the circular mask is not applied because
the configuration is not reporting round screen. Configuration is
computed based on the display, so we can only depend on it having the
correct information after the display became ready.
Bug:
23689649
Bug:
23325855
Change-Id: I1e1fa307836f4053cfc4978da0239cb42c5af2c3
Svet Ganov [Tue, 15 Sep 2015 20:10:30 +0000 (20:10 +0000)]
am
cd946024: Default grant SMS and Phone to the verifier
* commit '
cd946024e94a8fe2f4009dbd2e5463817a17b3a9':
Default grant SMS and Phone to the verifier
Zach Jang [Tue, 15 Sep 2015 20:09:52 +0000 (20:09 +0000)]
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
This reverts commit
82b70db7dd906013d131737a5bec2ae59b41ae61.
Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
Lorenzo Colitti [Tue, 15 Sep 2015 06:56:01 +0000 (15:56 +0900)]
Framework fixes for RSSI offload.
1. When registering a NetworkCallback, only update RSSI
thresholds if the request specifies a signal strength.
2. When releasing a NetworkCallback, only update RSSI
thresholds if the request specified a signal strength.
3. Add logging.
Add logging.
Bug:
21405941
Bug:
23679346
Bug:
23815756
Change-Id: I4bc42d0ab02285a7a9d14e09f8a1cd868f4d9d7f
Lorenzo Colitti [Tue, 15 Sep 2015 03:06:12 +0000 (03:06 +0000)]
am
3bb69fac: am
1d121b78: am
e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
* commit '
3bb69facad5bbde2f722cef30b55375bea3c2748':
NetworkDiagnostics: ping default router from all global addreses.
Lorenzo Colitti [Tue, 15 Sep 2015 02:56:03 +0000 (02:56 +0000)]
am
1d121b78: am
e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
* commit '
1d121b783324e86f1cd06fb3de91a35cacf3903f':
NetworkDiagnostics: ping default router from all global addreses.
Lorenzo Colitti [Tue, 15 Sep 2015 02:46:36 +0000 (02:46 +0000)]
am
e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
* commit '
e1e97377d04ab6e5d069c85aba4226f47371e7c6':
NetworkDiagnostics: ping default router from all global addreses.
Lorenzo Colitti [Tue, 15 Sep 2015 02:39:20 +0000 (02:39 +0000)]
Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
Jim Miller [Tue, 15 Sep 2015 01:58:08 +0000 (18:58 -0700)]
Add logging to track fingerprint reco but not unlocking
Bug
23940153
Change-Id: Idb01802ba68449370e8f3cbede0e2fe6d0b977ce
Vinod Krishnan [Mon, 14 Sep 2015 22:36:29 +0000 (22:36 +0000)]
am
aae9c4ab: am
74c3a0e7: Merge "Add some constants for Wear MNC Perms" into cw-e-dev
* commit '
aae9c4ab35ac98e8106d6a57d9d094780fbb0189':
Add some constants for Wear MNC Perms
Vinod Krishnan [Mon, 14 Sep 2015 22:31:46 +0000 (22:31 +0000)]
am
74c3a0e7: Merge "Add some constants for Wear MNC Perms" into cw-e-dev
* commit '
74c3a0e7b42e11ccd8f427660825bf6b3e3a4afc':
Add some constants for Wear MNC Perms
Sridhar Vashist [Mon, 14 Sep 2015 22:23:57 +0000 (22:23 +0000)]
am
c3504304: am
92a420eb: am
efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
* commit '
c350430490cce6b54a5c38f91e8a12d245332c18':
DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
Filip Gruszczynski [Mon, 14 Sep 2015 22:23:52 +0000 (22:23 +0000)]
am
31f01e2f: am
4cc1553c: am
0b388d4a: (-s ours) Don\'t animate burn-in return when it wasn\'t applied.
* commit '
31f01e2f2a4d322db9d25dc3b74da52f6851882f':
Don't animate burn-in return when it wasn't applied.
Vinod Krishnan [Mon, 14 Sep 2015 22:23:25 +0000 (22:23 +0000)]
Merge "Add some constants for Wear MNC Perms" into cw-e-dev
Sridhar Vashist [Mon, 14 Sep 2015 22:17:14 +0000 (22:17 +0000)]
am
92a420eb: am
efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
* commit '
92a420eb184015f9bae2d189ef335f86af9cbcbb':
DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
Filip Gruszczynski [Mon, 14 Sep 2015 22:17:08 +0000 (22:17 +0000)]
am
4cc1553c: am
0b388d4a: (-s ours) Don\'t animate burn-in return when it wasn\'t applied.
* commit '
4cc1553c931e26efad17cc1a1b74b0a0d880f301':
Don't animate burn-in return when it wasn't applied.
Sridhar Vashist [Mon, 14 Sep 2015 22:05:14 +0000 (22:05 +0000)]
am
efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
* commit '
efc03355860359bb3edbb9573ba310f02742f416':
DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
Filip Gruszczynski [Mon, 14 Sep 2015 22:05:09 +0000 (22:05 +0000)]
am
0b388d4a: (-s ours) Don\'t animate burn-in return when it wasn\'t applied.
* commit '
0b388d4a368e8503411450504c6e3d39952bce16':
Don't animate burn-in return when it wasn't applied.
Adrian Roos [Mon, 14 Sep 2015 21:19:14 +0000 (21:19 +0000)]
am
9902b3bc: am
699a5376: am
6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev
* commit '
9902b3bc8d11fd3ef33644315a87436b7a48c78b':
Fix light status bar transitions
Alex Hills [Mon, 14 Sep 2015 20:37:12 +0000 (16:37 -0400)]
resolved conflicts for
693e11e5 to mnc-dr-dev-plus-aosp
Change-Id: I701841759a80f434a09b086492e817ca23a6a2e6
Vinod Krishnan [Tue, 1 Sep 2015 02:30:20 +0000 (19:30 -0700)]
Add some constants for Wear MNC Perms
- Add an API for getting list of apps that has runtime perms
Change-Id: I4ebfc01033ea96efaac062fd34982fbd0d081073
Adrian Roos [Mon, 14 Sep 2015 19:03:06 +0000 (19:03 +0000)]
am
699a5376: am
6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev
* commit '
699a5376c695b8e7570dfc83123fbfbfcba5da12':
Fix light status bar transitions
Adrian Roos [Mon, 14 Sep 2015 18:54:28 +0000 (18:54 +0000)]
am
6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev
* commit '
6b04e3a6ea042be0e012f7501fadb461b3d772a7':
Fix light status bar transitions
Adrian Roos [Mon, 14 Sep 2015 18:47:59 +0000 (18:47 +0000)]
Merge "Fix light status bar transitions" into mnc-dr-dev
Alexander Hills [Mon, 14 Sep 2015 18:39:35 +0000 (18:39 +0000)]
am
6a261fd6: Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev
* commit '
6a261fd653eab7c8071290b71e3bfb3fe3598a49':
Cherry-pick system theme rebase to fix square UI on round watches
Alexander Hills [Mon, 14 Sep 2015 18:34:32 +0000 (18:34 +0000)]
Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev
Chris Manton [Mon, 14 Sep 2015 17:46:23 +0000 (17:46 +0000)]
am
f40365f1: am
ae0b7ca9: am
c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
* commit '
f40365f17a2f01612139e909039a09308001fdde':
Add capability to ignore carrier entitlement checks
Chris Manton [Mon, 14 Sep 2015 17:39:31 +0000 (17:39 +0000)]
am
ae0b7ca9: am
c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
* commit '
ae0b7ca9ad2e21853af06a68c02da068f748f8bd':
Add capability to ignore carrier entitlement checks
Chris Manton [Mon, 14 Sep 2015 17:29:09 +0000 (17:29 +0000)]
am
c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
* commit '
c9180528452d67359618eda4aa2edd39112c83ca':
Add capability to ignore carrier entitlement checks
Chris Manton [Mon, 14 Sep 2015 17:23:42 +0000 (17:23 +0000)]
Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
Christopher Wiley [Mon, 14 Sep 2015 16:06:52 +0000 (16:06 +0000)]
am
3a86b41f: Add a textual hint as to where aidl has gone
* commit '
3a86b41f8414193e05c27284d434b07992e164ce':
Add a textual hint as to where aidl has gone
Christopher Wiley [Mon, 14 Sep 2015 15:54:23 +0000 (08:54 -0700)]
Add a textual hint as to where aidl has gone
Bug:
23691099
Change-Id: I3fb917b4c0e66a83c6299add02869a7088010adc
Christopher Wiley [Mon, 14 Sep 2015 15:47:38 +0000 (15:47 +0000)]
am
27a0be36: resolved conflicts for
ddf53180 to stage-aosp-master
* commit '
27a0be36eeee9d1d03076727977dfb1e725fcd77':
Remove the aidl tool
Alan Viverette [Tue, 11 Aug 2015 21:27:04 +0000 (17:27 -0400)]
Cherry-pick system theme rebase to fix square UI on round watches
Our system themes were based on configurations that were added post-
init of the system theme.
I96e695441543379e4d5fdf3cc6f18d9e6cf953b4 broke this, because there
was a race condition in the code for rebasing themes
If8fecde76d62738a8e55eddf898eafc468afdba2 (the cherry-picked commit)
fixes the race condition and adds the rebasing back in.
This change cherry picks If8fecde76d62738a8e55eddf898eafc468afdba2.
Bug:
23387146
Change-Id: I0725028e48599fc6cd9731ae16c71474dd5827e5
Christopher Wiley [Mon, 14 Sep 2015 14:34:50 +0000 (07:34 -0700)]
resolved conflicts for
ddf53180 to stage-aosp-master
Change-Id: I265ab876ef29dc731e6abb6f964c10f2e71324be
Christopher Wiley [Mon, 14 Sep 2015 14:11:19 +0000 (14:11 +0000)]
Merge "Remove the aidl tool"
Svet Ganov [Sat, 12 Sep 2015 17:19:54 +0000 (10:19 -0700)]
Default grant SMS and Phone to the verifier
bug:
24012164
Change-Id: I756644c8044076b2550d7ca104f542f50da0226b
Jorim Jaggi [Sat, 12 Sep 2015 01:53:16 +0000 (01:53 +0000)]
am
12e273fe: am
f66e4979: am
84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager
* commit '
12e273fe76f1f0e6b5cffb687da7411d73dfe7c6':
Dump Keyguard state in SystemUI and PhoneWindowManager
Jorim Jaggi [Sat, 12 Sep 2015 01:45:43 +0000 (01:45 +0000)]
am
f66e4979: am
84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager
* commit '
f66e4979c579bde5031c8e6f29e5163246fc54ee':
Dump Keyguard state in SystemUI and PhoneWindowManager
Jorim Jaggi [Sat, 12 Sep 2015 01:34:26 +0000 (01:34 +0000)]
am
84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager
* commit '
84dc08a208eea7a4ddf043cadbb28987cf90ae22':
Dump Keyguard state in SystemUI and PhoneWindowManager
Selim Cinek [Sat, 12 Sep 2015 01:30:14 +0000 (01:30 +0000)]
am
19694a0e: am
4140a21e: Merge "Fix scrolling of QS panel when no notification is present."
* commit '
19694a0eeffd224189615ed761a5f8e4f912b343':
Fix scrolling of QS panel when no notification is present.
Jorim Jaggi [Sat, 12 Sep 2015 00:45:22 +0000 (17:45 -0700)]
Dump Keyguard state in SystemUI and PhoneWindowManager
Bug:
23970549
Change-Id: Iec1e8ac507268086e0e2935847eda606ea1fb700
Selim Cinek [Sat, 12 Sep 2015 01:21:49 +0000 (01:21 +0000)]
am
4140a21e: Merge "Fix scrolling of QS panel when no notification is present."
* commit '
4140a21e2ec69089de916e240fd606a3daf09896':
Fix scrolling of QS panel when no notification is present.
Selim Cinek [Sat, 12 Sep 2015 01:10:10 +0000 (01:10 +0000)]
Merge "Fix scrolling of QS panel when no notification is present."
Adrian Roos [Fri, 11 Sep 2015 19:38:43 +0000 (12:38 -0700)]
Fix light status bar transitions
Bug:
23971926
Change-Id: Ia3c6fb18d38fb7479028191ad3df8389adb830ec
Alan Viverette [Fri, 11 Sep 2015 23:30:34 +0000 (23:30 +0000)]
am
7914680e: am
58c483fc: am
62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
* commit '
7914680e1ec319f50cb99b6c761aace56fc6e3ed':
Avoid OOBE when AbsListView layout is out of sync with adapter
Alan Viverette [Fri, 11 Sep 2015 23:22:07 +0000 (23:22 +0000)]
am
58c483fc: am
62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
* commit '
58c483fcff4608ead41f8af9b2b1e2d5ae92561c':
Avoid OOBE when AbsListView layout is out of sync with adapter
Shawn Willden [Fri, 11 Sep 2015 22:36:21 +0000 (22:36 +0000)]
am
b9b5d86b: resolved conflicts for
b15e1ff5 to stage-aosp-master
* commit '
b9b5d86b0e2a7e32259f2606024745439ebb43e1':
Update KeymasterDefs
Alan Viverette [Fri, 11 Sep 2015 22:25:29 +0000 (22:25 +0000)]
am
62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
* commit '
62b94c353a8748ef10691da4844bf894e1155870':
Avoid OOBE when AbsListView layout is out of sync with adapter
Christopher Wiley [Fri, 11 Sep 2015 21:24:24 +0000 (14:24 -0700)]
Remove the aidl tool
This has been moved into its own repository at
//system/tools/aidl
Test: Built aosp_arm-eng from scratch.
Bug:
23691099
Change-Id: Ic45d55682b9dcafe894efe0a6317792f9c1236c6
Chris Manton [Tue, 1 Sep 2015 20:56:46 +0000 (13:56 -0700)]
Add capability to ignore carrier entitlement checks
Boolean to check to ignore carrier entitlement check.
API to follow later.
Carrier configuration manager has an option
to override tethering entitlement checks.
Ignore entitlement checks if overridden by
the carrier configuration flag.
bug:
23712807
Change-Id: I6c9b3b9994279e592db304debef54809338fe9cf
Alan Viverette [Fri, 11 Sep 2015 21:28:59 +0000 (21:28 +0000)]
Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
Tyler Gunn [Fri, 11 Sep 2015 15:58:00 +0000 (15:58 +0000)]
am
9b5f75f7: am
ca7240a0: am
8ed28188: Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev
* commit '
9b5f75f7bf15541af3cf51beb9dfaabbe70d8d87':
Add carrier config for characters to escape with backslash.
Tyler Gunn [Fri, 11 Sep 2015 15:49:55 +0000 (15:49 +0000)]
am
ca7240a0: am
8ed28188: Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev
* commit '
ca7240a0726a110b9fd302a62ea9baaf3c5d14ac':
Add carrier config for characters to escape with backslash.
Tyler Gunn [Fri, 11 Sep 2015 15:43:19 +0000 (15:43 +0000)]
am
8ed28188: Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev
* commit '
8ed28188b95be4f377909ac2abacaef76e004a61':
Add carrier config for characters to escape with backslash.
Tyler Gunn [Fri, 11 Sep 2015 15:37:40 +0000 (15:37 +0000)]
Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev
Shawn Willden [Fri, 11 Sep 2015 15:07:42 +0000 (09:07 -0600)]
resolved conflicts for
b15e1ff5 to stage-aosp-master
Change-Id: I28a843a94855193d4b90dc9bec028eb5338eeed7
Shawn Willden [Fri, 11 Sep 2015 13:21:15 +0000 (13:21 +0000)]
Merge "Update KeymasterDefs"
Roshan Pius [Fri, 11 Sep 2015 06:42:15 +0000 (06:42 +0000)]
am
471d5488: am
e3d006b1: am
0a067dc7: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
* commit '
471d54881b1d87819a62e3913232a66563430a3f':
Add a new carrier config for DTMF tone gap.