OSDN Git Service
Benjamin Franz [Mon, 11 Jan 2016 16:35:06 +0000 (16:35 +0000)]
am
cecb3621: am
a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev
am:
48bb01e1ef
* commit '
48bb01e1ef74a8e3e7595ba880bb5072b3d1a23b':
Doris Liu [Mon, 11 Jan 2016 16:32:57 +0000 (16:32 +0000)]
am
3ebbc50c: am
27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev
am:
b343db76aa
* commit '
b343db76aa8623a0253746f70beb5543c3ae5473':
Roozbeh Pournader [Mon, 11 Jan 2016 16:31:02 +0000 (16:31 +0000)]
am
33d1c27e: am
087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev
am:
20a862ba14
* commit '
20a862ba1474ac994c2ed35daf094910c0215ff3':
Amit Mahajan [Mon, 11 Jan 2016 16:29:02 +0000 (16:29 +0000)]
Jeff Sharkey [Mon, 11 Jan 2016 16:26:46 +0000 (16:26 +0000)]
am
3b342179: am
a320505f: Merge "Move both app code and data together." into mnc-dev
am:
399199fe82
* commit '
399199fe8239c11f902265b03f90dc8194e59a53':
John Reck [Mon, 11 Jan 2016 16:24:27 +0000 (16:24 +0000)]
am
7e22cc99: am
78760b4a: Merge "A bunch more cleanups" into mnc-dev
am:
1ad0936c77
* commit '
1ad0936c77d3c742970e7051c62c715a00c082ca':
Geoff Mendal [Mon, 21 Dec 2015 13:13:55 +0000 (05:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8469dc7993a2ff864d81cb7a5b2e743e5c1e0220
Auto-generated-cl: translation import
Daniel Koulomzin [Fri, 18 Dec 2015 20:09:35 +0000 (20:09 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am:
cbef517d02
am:
898e330aae
* commit '
898e330aaedbfa9e41d649187800c307e3d84169':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Daniel Koulomzin [Fri, 18 Dec 2015 19:55:52 +0000 (11:55 -0800)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
am:
cbef517d02
* commit '
cbef517d02f4f3680e155cc1a704ebf5c959d03f':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Daniel Koulomzin [Fri, 18 Dec 2015 19:49:18 +0000 (19:49 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
Robert Greenwalt [Fri, 18 Dec 2015 19:42:58 +0000 (11:42 -0800)]
Robert Greenwalt [Fri, 18 Dec 2015 19:36:54 +0000 (19:36 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926 am:
3927089cce
am:
f1530bf3d7
* commit '
f1530bf3d72315256dd7a2c18ba383dc15445b54':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:31:54 +0000 (11:31 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926
am:
3927089cce
* commit '
3927089cce9d43a0b517f53fd6a542f07cb0955b':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:24:53 +0000 (11:24 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5
am:
1e04dfb926
* commit '
1e04dfb926040a6fad073fca0835777123d155e7':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:17:58 +0000 (19:17 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3
am:
81674b1ff5
* commit '
81674b1ff5deedcf2f1a79f07441e506a4f66354':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:04:25 +0000 (19:04 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798
am:
2ecc918bd3
* commit '
2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 18:48:59 +0000 (18:48 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489
am:
5946a9b798
* commit '
5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 18:38:10 +0000 (18:38 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
am:
5a77651489
* commit '
5a77651489ace080671034a85e5771c6ddc73525':
Protect some new broadcasts.
Daniel Koulomzin [Wed, 16 Dec 2015 22:52:25 +0000 (17:52 -0500)]
Making ViewRootImpl drop input events when the Activity is in ambient
mode.
WearableActivityController tells ViewRootImpl about ambient mode.
Bug:
25912259
Bug:
25973146
Bug:
25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
Robert Greenwalt [Fri, 18 Dec 2015 03:32:43 +0000 (19:32 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
Mark Lu [Fri, 18 Dec 2015 00:18:45 +0000 (16:18 -0800)]
Fix system watchdog timeout when reading too many usage events.
am:
8877120173
* commit '
8877120173fd62d6701822471f06fe84e992c2ae':
Fix system watchdog timeout when reading too many usage events.
Mark Lu [Fri, 6 Nov 2015 07:26:15 +0000 (15:26 +0800)]
Fix system watchdog timeout when reading too many usage events.
Symptom:
As issue link:
https://code.google.com/p/android/issues/detail?id=193100
RootCause:
UsageStatsService.onDisplayChanged executed in system main thread,
If calling UsageStatsManager.queryEvents with too many events before it
(i.e. in daily usage event file,
too many activity resume / pause events or configuration change
during monkey test),
System will be blocked then watchdog timeout.
Solution:
Let display listener executed in background thread handler
BUG:
25355086
Change-Id: Ic894d112612400ed8fb7ba843b3309fdc4f66fe1
(Cherrypicked from
4e59db328d8b0cc163d2e3eb0f7f3a108f20a58d)
(cherry picked from commit
7018f60b06fd0c647ebf13225320d7e15d02e075)
Robert Greenwalt [Thu, 17 Dec 2015 23:15:09 +0000 (15:15 -0800)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f am:
a652b7161d
am:
c99c41781c
* commit '
c99c41781c69d2cfef411c531cf879e84ca62a74':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:13:36 +0000 (15:13 -0800)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6 am:
064eb2a7cc
am:
5d7bb383b8
* commit '
5d7bb383b85aeaa60abeb6e3ad7ba854d6c40b37':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:09:11 +0000 (23:09 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f
am:
a652b7161d
* commit '
a652b7161d3069ba9b5650f1caf741d2588de141':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:07:22 +0000 (23:07 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6
am:
064eb2a7cc
* commit '
064eb2a7cc8b811671682018b82c2b63064971ef':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:04:24 +0000 (23:04 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe
am:
628b8f1f5f
* commit '
628b8f1f5f6d249e2f222602352d14c40d648d97':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:01:33 +0000 (23:01 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev
am:
ef58df63d6
* commit '
ef58df63d6ba9d56620b6a440f15d0e07c842a44':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 22:58:14 +0000 (22:58 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
am:
4557ef32fe
* commit '
4557ef32fe36b6f7ef7918052400d18af51d452f':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 22:52:58 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev
Robert Greenwalt [Thu, 17 Dec 2015 22:52:56 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
Bryce Lee [Thu, 17 Dec 2015 19:51:17 +0000 (19:51 +0000)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am:
cf91b45c05
am:
9eaa59a1ff
* commit '
9eaa59a1ff315bbf4d9809b30bf7777aa88e6bee':
Add setting for declaring disabled bluetooth profiles.
Bryce Lee [Thu, 17 Dec 2015 19:45:17 +0000 (11:45 -0800)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
am:
cf91b45c05
* commit '
cf91b45c05358c81ddaccf3ddd4b1ea6d5295faa':
Add setting for declaring disabled bluetooth profiles.
Bryce Lee [Thu, 17 Dec 2015 19:40:47 +0000 (19:40 +0000)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
Bryce Lee [Thu, 17 Dec 2015 00:20:34 +0000 (00:20 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am:
cae2f2415b
am:
fc3762aafd
* commit '
fc3762aafd58ff9eada0b5ed261de20a40d7b07a':
Add UUID to BluetoothHeadsetClientCall
Bryce Lee [Thu, 17 Dec 2015 00:09:56 +0000 (00:09 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
am:
cae2f2415b
* commit '
cae2f2415ba04eb854fdcdc6aa66c857ad7148d0':
Add UUID to BluetoothHeadsetClientCall
Bryce Lee [Thu, 17 Dec 2015 00:02:41 +0000 (00:02 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
Adam Lesinski [Wed, 16 Dec 2015 23:35:17 +0000 (23:35 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638 am:
40d1ab91d2 am:
8c9209183f
am:
7f5ad22330
* commit '
7f5ad223306a482bdf33d213971af041e9fba590':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Bryce Lee [Wed, 16 Dec 2015 23:33:59 +0000 (15:33 -0800)]
Add UUID to BluetoothHeadsetClientCall
This will allow for unique identification of a call as id only provides
uniqueness per session.
Bug:
26016489
Change-Id: I643d24bf5ff5680c26e530075649ef2a4f378295
Adam Lesinski [Wed, 16 Dec 2015 23:25:45 +0000 (23:25 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638 am:
40d1ab91d2
am:
8c9209183f
* commit '
8c9209183fa67953bebe1adb5dfb529c1b6273f0':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Adam Lesinski [Wed, 16 Dec 2015 23:16:18 +0000 (23:16 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638
am:
40d1ab91d2
* commit '
40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Adam Lesinski [Wed, 16 Dec 2015 23:09:27 +0000 (23:09 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
am:
b2c5155638
* commit '
b2c51556382acd3981e5a6380e2fb3d85c2f68a5':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Adam Lesinski [Wed, 2 Dec 2015 23:40:19 +0000 (15:40 -0800)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Include <uses-permission-sdk-23> permissions in dump badging and dump permissions.
This will also add implied features for that permission, marked as -sdk-23 features.
Ex:
uses-permission: name='android.permission.ACCESS_FINE_LOCATION'
uses-permission-sdk-23: name='android.permission.CAMERA'
feature-group: label=''
uses-feature: name='android.hardware.location'
uses-implied-feature: name='android.hardware.location' reason='...'
uses-feature-sdk-23: name='android.hardware.camera'
uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...'
Bug:
24939655
Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3
(cherry picked from commit
5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)
Bryce Lee [Wed, 16 Dec 2015 21:32:28 +0000 (13:32 -0800)]
Add setting for declaring disabled bluetooth profiles.
Bug:
25900899
Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a
Geoff Mendal [Wed, 16 Dec 2015 05:18:39 +0000 (05:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
d0dd157ade -s ours
am:
4893042569 -s ours
* commit '
489304256944d6d170ab4dfd30a3e53efd994d2b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:17:12 +0000 (05:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
8b4b230174 -s ours
am:
82ce2a6cdb -s ours
* commit '
82ce2a6cdbf0eedfca0ef3f2716a09e10d159202':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:11:07 +0000 (05:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
d0dd157ade -s ours
* commit '
d0dd157ade7536286e32ecbb271d3561bd7b5e93':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:09:37 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
8b4b230174 -s ours
* commit '
8b4b230174228fd6313ae493a44cc7dc67c6bfc4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:05:55 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
10bc1c7000 -s ours
am:
c8ddc96f01 -s ours
* commit '
c8ddc96f01b52b4aab1741fc033076dd46b076f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:05:18 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 05:03:50 +0000 (21:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia8ab8097f7b82ed5fb344351035535c5b3b0690d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 05:02:26 +0000 (05:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 05:00:49 +0000 (21:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifbe7e97f2a1fe1b688642a8179c0e184d69ba3cb
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:58:38 +0000 (04:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
10bc1c7000 -s ours
* commit '
10bc1c7000e1c9d232a1074e8788ed75ee4c2117':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:54:38 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
df5dd062a0 -s ours
am:
a32b362f00 -s ours
* commit '
a32b362f00338421789679dcb5ddd3bd3c2c6711':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:53:01 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
531eb5b484 -s ours
am:
57a89670cb -s ours
* commit '
57a89670cbe157cf8a99a6a0f0a10b37aac2b8ee':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:49:00 +0000 (04:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:45:33 +0000 (20:45 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
327d917865 -s ours
am:
7babe8de9e -s ours
* commit '
7babe8de9eb51c5c23c9d3257314aa374112d550':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:45:33 +0000 (20:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idc7e685457dc0bc2da4df2bd10ac2187d64fa00f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:45:32 +0000 (04:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
df5dd062a0 -s ours
* commit '
df5dd062a0016ff66239e4507da07a90a83063dc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:43:18 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
531eb5b484 -s ours
* commit '
531eb5b484765888aa0dd969645593b50144c201':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:43:18 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE am:
22dea4e16f -s ours
am:
d8004c03d2 -s ours
* commit '
d8004c03d2c05d84e38ce3a5da88fd4b2c4e9681':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:36:13 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:35:34 +0000 (20:35 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
327d917865 -s ours
* commit '
327d917865331d1b6823495e1e4ba43930caaacb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:34:53 +0000 (20:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic3c47d16450ddb80c815369cf01bb63be1f73a88
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:34:26 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:33:27 +0000 (20:33 -0800)]
Import translations. DO NOT MERGE
am:
22dea4e16f -s ours
* commit '
22dea4e16f9a32eb4693829b59462c32dda3f45c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:29:48 +0000 (20:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie93a6af2b483228b5797bdb018ac8accc7ef54ed
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:26:04 +0000 (04:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:21:26 +0000 (20:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I28f308a8339779f14ccf90581665624317afb4d3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:18:32 +0000 (20:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I72a2242dff4a0d0c661bcdbc2ed2cca8dc38a89e
Auto-generated-cl: translation import
Adam Lesinski [Tue, 15 Dec 2015 23:57:13 +0000 (23:57 +0000)]
Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev
am:
1d6d4c5a69
* commit '
1d6d4c5a695051ccb9b455306b155bad5d6f136a':
DO NOT MERGE: Fix batterystats battery level int packing
Adam Lesinski [Tue, 15 Dec 2015 23:52:43 +0000 (23:52 +0000)]
Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev
Adam Lesinski [Fri, 13 Nov 2015 23:54:59 +0000 (15:54 -0800)]
DO NOT MERGE: Fix batterystats battery level int packing
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:
25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
(cherry picked from commit
6902052c77bbcb9078b4ced243874f67542f64f9)
Adam Lesinski [Tue, 15 Dec 2015 22:01:03 +0000 (22:01 +0000)]
Use wakeup reason when FingerPrint sensor wakes up the device
am:
9289560aa0
* commit '
9289560aa0d195dfed67dab05811114bc7bc88a9':
Use wakeup reason when FingerPrint sensor wakes up the device
Adam Lesinski [Wed, 4 Nov 2015 00:31:25 +0000 (16:31 -0800)]
Use wakeup reason when FingerPrint sensor wakes up the device
PowerManager can log into BatteryStats the reason for the device being
woken up. This change has the Fingerprint controller report the reason
instead of a default non-descriptive 'wakeUp' reason.
Bug:
26209577
Change-Id: I12d80682dad888add139cca586d4b948e9d546e5
(cherry picked from commit
5bcb8bb31ab6688dff432cb7bd20fe69016c7003)
Bryce Lee [Mon, 14 Dec 2015 23:57:38 +0000 (23:57 +0000)]
Allow access to deprecated LOCK_PATTERN_ENABLED flag. am:
4614596a39
am:
36393a5674
* commit '
36393a5674bf50b351b5961a194ce2814ca00140':
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
Bryce Lee [Mon, 14 Dec 2015 23:43:54 +0000 (23:43 +0000)]
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
am:
4614596a39
* commit '
4614596a395b6c86fff3f35a07edda2e848d743c':
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
Bryce Lee [Mon, 14 Dec 2015 22:39:10 +0000 (14:39 -0800)]
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
It is possible that older platforms may have not cleared the lock pattern,
but instead only checked this flag to determine the lock pattern enabled
state. In such cases, upgrading to a platform with that only checks the
lock pattern can lead to the lock screen being re-enabled by accident.
These new methods allow this condition to be identified and resolved.
Bug:
26029690
Change-Id: I8f7ebc0e1915049afe49c219c87010aa38a16244
Ian Pedowitz [Sat, 12 Dec 2015 01:12:35 +0000 (17:12 -0800)]
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
am:
cf07154e71
* commit '
cf07154e7102de304f1d887c8c2a2ef61b4880d7':
DO NOT MERGE Remove more extras during notification lightening.
Ian Pedowitz [Sat, 12 Dec 2015 01:06:43 +0000 (01:06 +0000)]
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
Dan Sandler [Tue, 8 Dec 2015 20:42:41 +0000 (15:42 -0500)]
DO NOT MERGE Remove more extras during notification lightening.
Basically anything Parcelable needs to go since it might be
quite large. Note that this includes additional extras such as
those contributed by WearableExtender.
Cherry-picked from
5012853de26eac023deda82d138a35677fe6117b
Bug:
26038546
Change-Id: I00eadd2b23dfc4fccf42332df658373bb05b8a45
Christopher Tate [Fri, 11 Dec 2015 19:37:19 +0000 (11:37 -0800)]
Don\'t back up / restore EAP network definitions
am:
a89f9d93cb
* commit '
a89f9d93cbda665259812e990bca1045bd8abf9f':
Don't back up / restore EAP network definitions
Christopher Tate [Wed, 18 Nov 2015 02:01:52 +0000 (18:01 -0800)]
Don't back up / restore EAP network definitions
Bug
25725016
Cherrypick from AOSP.
Change-Id: I6aa11a76e7724a0aaad05a1aa074afa2c429370c
Dianne Hackborn [Fri, 11 Dec 2015 00:26:55 +0000 (16:26 -0800)]
Work on issue #
25467052: System lagged out
am:
022c748f54
* commit '
022c748f54626f77f01079595a0100d1d145f383':
Work on issue #
25467052: System lagged out
Dianne Hackborn [Wed, 4 Nov 2015 20:32:45 +0000 (12:32 -0800)]
Work on issue #
25467052: System lagged out
Add a new mechanism where we retain previously used provided
processes in the "last activity" oom adj state for 20 seconds,
before allowing them to fall down to a regular cached process.
This should help reduce thrashing when something is acquiring
and releasing a provider repeatedly.
Change-Id: I889472de7bb4da574b46f07e36a99978813643cb
Adam Lesinski [Thu, 10 Dec 2015 22:47:09 +0000 (14:47 -0800)]
Prevent DivideByZero error in BatteryStatsImpl
am:
ba88e68fe4
* commit '
ba88e68fe47b66f1fc5d10c15f04f20fe662399e':
Prevent DivideByZero error in BatteryStatsImpl
Adam Lesinski [Tue, 8 Dec 2015 20:06:55 +0000 (12:06 -0800)]
Prevent DivideByZero error in BatteryStatsImpl
It was assumed that when a UID had either rx or tx bytes/packets that it would
have the other as well.
Bug:
25706750
Change-Id: Iefac59a6bd02876aed9a0bac218d187b81807a95
Bryce Lee [Wed, 9 Dec 2015 23:01:13 +0000 (15:01 -0800)]
Improve logging in BluetoothHeadsetClientCall. am:
3c67873f0a
am:
180dd72a9b
* commit '
180dd72a9b36ca6f74e5ad255347d815a0c8729a':
Improve logging in BluetoothHeadsetClientCall.
Bryce Lee [Wed, 9 Dec 2015 22:54:19 +0000 (22:54 +0000)]
Improve logging in BluetoothHeadsetClientCall.
am:
3c67873f0a
* commit '
3c67873f0a20a958f6cf1ccccb472fa050bf55b7':
Improve logging in BluetoothHeadsetClientCall.
Bryce Lee [Tue, 8 Dec 2015 19:22:31 +0000 (11:22 -0800)]
Improve logging in BluetoothHeadsetClientCall.
Bug:
26032099
Change-Id: I497edc9aa4c19cc7159993a899071e7b0c26db63
Prashant Malani [Tue, 8 Dec 2015 01:37:05 +0000 (01:37 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev am:
487f0d3d15
am:
6344cb8144
* commit '
6344cb8144647e4e49bc69cbf34a084ca7712115':
Add rotary encoder input source
Prashant Malani [Tue, 8 Dec 2015 01:31:31 +0000 (01:31 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev
am:
487f0d3d15
* commit '
487f0d3d1556296ef53c449d7ec5de5a0dac1f83':
Add rotary encoder input source
Prashant Malani [Tue, 8 Dec 2015 01:27:18 +0000 (01:27 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev
Chenjie Luo [Mon, 7 Dec 2015 23:28:44 +0000 (23:28 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am:
e56f7b0d1d
am:
bef0525c38
* commit '
bef0525c385c95f4ff6710ad9b117429a4d5ce63':
Check NPE beforehand instead of catching it at runtime
Amit Mahajan [Mon, 7 Dec 2015 23:10:55 +0000 (23:10 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
am:
cd2cc9aa9b
* commit '
cd2cc9aa9bfdc21a06ffd7049a4b4ad07bbf6886':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
Julia Reynolds [Mon, 7 Dec 2015 23:08:01 +0000 (23:08 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev
am:
dde5a6ef28
* commit '
dde5a6ef2846bfb6b253b0946a7b9e42a11b8348':
Fix radio button flash on hour change.
Chenjie Luo [Mon, 7 Dec 2015 23:06:36 +0000 (23:06 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
am:
e56f7b0d1d
* commit '
e56f7b0d1d92390c3409999ea841525514163f65':
Check NPE beforehand instead of catching it at runtime
Chenjie Luo [Mon, 7 Dec 2015 21:04:14 +0000 (21:04 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
Robert Greenwalt [Fri, 4 Dec 2015 19:51:49 +0000 (11:51 -0800)]
Check permissions on getDeviceId.
This needs the package name passed in, so the aidl changes.
bug:
25778215
Change-Id: I72f3456a2774a7ad5104424daea9e046ee9c6360
OSDN Git Service
