drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,600 Commits 1 Branch 0 Tags
Commit Graph

206600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
fd87e92a42 Import translations. DO NOT MERGE 
Change-Id: If00b01a244af6221a01d0c060c58da7389fd1b35
Auto-generated-cl: translation import
 2015-12-21 06:50:08 -08:00
Martijn Coenen
24584f0b34 Clear calling identify b4 Beam callback. 
Fixes AppOps crash, because it notices the calling
package is different from the calling UID.

Bug: 25492633
Change-Id: I55e2d975fd0a7ee94c4623efb3b19b1b54b72da2
 2015-12-21 10:33:06 +00:00
Bryce Lee
d980b8c7a0 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev 
am: 9c27969385

* commit '9c27969385d7a59a535ba3274c279ae96a155d49':
  Remove duplicate Bluetooth profiles.
 2015-12-18 23:07:49 +00:00
Bryce Lee
9c27969385 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev 2015-12-18 23:02:40 +00:00
Daniel Koulomzin
898e330aae 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.
 2015-12-18 11:55:52 -08:00
Daniel Koulomzin
cbef517d02 Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev 2015-12-18 19:49:18 +00:00
Robert Greenwalt
fba515f614 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.
 2015-12-18 19:36:54 +00:00
Bryce Lee
15309a3d20 Remove duplicate Bluetooth profiles. 
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
 2015-12-18 11:34:20 -08:00
Robert Greenwalt
f1530bf3d7 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.
 2015-12-18 11:31:54 -08:00
Robert Greenwalt
3927089cce 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.
 2015-12-18 11:24:53 -08:00
Robert Greenwalt
1e04dfb926 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 
am: 81674b1ff5

* commit '81674b1ff5deedcf2f1a79f07441e506a4f66354':
  Protect some new broadcasts.
 2015-12-18 19:17:58 +00:00
Robert Greenwalt
81674b1ff5 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 
am: 2ecc918bd3

* commit '2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
  Protect some new broadcasts.
 2015-12-18 19:04:25 +00:00
Robert Greenwalt
2ecc918bd3 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 
am: 5946a9b798

* commit '5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
  Protect some new broadcasts.
 2015-12-18 18:48:59 +00:00
Robert Greenwalt
5946a9b798 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. 
am: 5a77651489

* commit '5a77651489ace080671034a85e5771c6ddc73525':
  Protect some new broadcasts.
 2015-12-18 18:38:10 +00:00
Daniel Koulomzin
087ae471c2 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
 2015-12-18 12:56:00 -05:00
Robert Greenwalt
5a77651489 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. 
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
 2015-12-17 19:32:43 -08:00
Mark Lu
8877120173 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)
 2015-12-18 00:03:16 +00:00
Robert Greenwalt
c99c41781c Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f 
am: a652b7161d

* commit 'a652b7161d3069ba9b5650f1caf741d2588de141':
  Check permissions on getDeviceId.
 2015-12-17 23:09:11 +00:00
Robert Greenwalt
5d7bb383b8 Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 
am: 064eb2a7cc

* commit '064eb2a7cc8b811671682018b82c2b63064971ef':
  Check permissions on getDeviceId.
 2015-12-17 23:07:22 +00:00
Robert Greenwalt
a652b7161d Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe 
am: 628b8f1f5f

* commit '628b8f1f5f6d249e2f222602352d14c40d648d97':
  Check permissions on getDeviceId.
 2015-12-17 23:04:24 +00:00
Robert Greenwalt
064eb2a7cc Merge "Check permissions on getDeviceId." into mnc-dr-dev 
am: ef58df63d6

* commit 'ef58df63d6ba9d56620b6a440f15d0e07c842a44':
  Check permissions on getDeviceId.
 2015-12-17 23:01:33 +00:00
Robert Greenwalt
628b8f1f5f Merge "Check permissions on getDeviceId." into mnc-dev 
am: 4557ef32fe

* commit '4557ef32fe36b6f7ef7918052400d18af51d452f':
  Check permissions on getDeviceId.
 2015-12-17 22:58:14 +00:00
Robert Greenwalt
ef58df63d6 Merge "Check permissions on getDeviceId." into mnc-dr-dev 2015-12-17 22:52:58 +00:00
Robert Greenwalt
4557ef32fe Merge "Check permissions on getDeviceId." into mnc-dev 2015-12-17 22:52:56 +00:00
Bryce Lee
9eaa59a1ff Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev 
am: cf91b45c05

* commit 'cf91b45c05358c81ddaccf3ddd4b1ea6d5295faa':
  Add setting for declaring disabled bluetooth profiles.
 2015-12-17 11:45:17 -08:00
Bryce Lee
cf91b45c05 Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev 2015-12-17 19:40:47 +00:00
Bryce Lee
fc3762aafd Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev 
am: cae2f2415b

* commit 'cae2f2415ba04eb854fdcdc6aa66c857ad7148d0':
  Add UUID to BluetoothHeadsetClientCall
 2015-12-17 00:09:56 +00:00
Bryce Lee
cae2f2415b Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev 2015-12-17 00:02:41 +00:00
Bryce Lee
e457fa4b9d 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
 2015-12-16 15:33:59 -08:00
Adam Lesinski
7f5ad22330 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
 2015-12-16 23:25:45 +00:00
Adam Lesinski
8c9209183f DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 
am: 40d1ab91d2

* commit '40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
 2015-12-16 23:16:18 +00:00
Adam Lesinski
40d1ab91d2 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 
am: b2c5155638

* commit 'b2c51556382acd3981e5a6380e2fb3d85c2f68a5':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
 2015-12-16 23:09:27 +00:00
Adam Lesinski
b2c5155638 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)
 2015-12-16 22:43:07 +00:00
Bryce Lee
ec85f34812 Add setting for declaring disabled bluetooth profiles. 
Bug: 25900899
Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a
 2015-12-16 13:32:28 -08:00
Geoff Mendal
4893042569 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: d0dd157ade  -s ours

* commit 'd0dd157ade7536286e32ecbb271d3561bd7b5e93':
  Import translations. DO NOT MERGE
 2015-12-16 05:11:07 +00:00
Geoff Mendal
82ce2a6cdb Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 8b4b230174  -s ours

* commit '8b4b230174228fd6313ae493a44cc7dc67c6bfc4':
  Import translations. DO NOT MERGE
 2015-12-16 05:09:37 +00:00
Geoff Mendal
d0dd157ade Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 05:05:18 +00:00
Geoff Mendal
8f316d2723 Import translations. DO NOT MERGE 
Change-Id: Ia8ab8097f7b82ed5fb344351035535c5b3b0690d
Auto-generated-cl: translation import
 2015-12-15 21:03:50 -08:00
Geoff Mendal
8b4b230174 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 05:02:26 +00:00
Geoff Mendal
1144462f6b Import translations. DO NOT MERGE 
Change-Id: Ifbe7e97f2a1fe1b688642a8179c0e184d69ba3cb
Auto-generated-cl: translation import
 2015-12-15 21:00:49 -08:00
Geoff Mendal
c8ddc96f01 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 10bc1c7000  -s ours

* commit '10bc1c7000e1c9d232a1074e8788ed75ee4c2117':
  Import translations. DO NOT MERGE
 2015-12-16 04:58:38 +00:00
Geoff Mendal
10bc1c7000 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 04:49:00 +00:00
Geoff Mendal
e0b74266f7 Import translations. DO NOT MERGE 
Change-Id: Idc7e685457dc0bc2da4df2bd10ac2187d64fa00f
Auto-generated-cl: translation import
 2015-12-15 20:45:33 -08:00
Geoff Mendal
a32b362f00 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: df5dd062a0  -s ours

* commit 'df5dd062a0016ff66239e4507da07a90a83063dc':
  Import translations. DO NOT MERGE
 2015-12-16 04:45:32 +00:00
Geoff Mendal
57a89670cb Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 531eb5b484  -s ours

* commit '531eb5b484765888aa0dd969645593b50144c201':
  Import translations. DO NOT MERGE
 2015-12-16 04:43:18 +00:00
Geoff Mendal
df5dd062a0 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 04:36:13 +00:00
Geoff Mendal
7babe8de9e Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 327d917865  -s ours

* commit '327d917865331d1b6823495e1e4ba43930caaacb':
  Import translations. DO NOT MERGE
 2015-12-15 20:35:34 -08:00
Geoff Mendal
648fa53981 Import translations. DO NOT MERGE 
Change-Id: Ic3c47d16450ddb80c815369cf01bb63be1f73a88
Auto-generated-cl: translation import
 2015-12-15 20:34:53 -08:00
Geoff Mendal
531eb5b484 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 04:34:26 +00:00
Geoff Mendal
d8004c03d2 Import translations. DO NOT MERGE 
am: 22dea4e16f  -s ours

* commit '22dea4e16f9a32eb4693829b59462c32dda3f45c':
  Import translations. DO NOT MERGE
 2015-12-15 20:33:27 -08:00