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

206399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
50843b1708 Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc 
am: 5d7bb383b8

* commit '5d7bb383b85aeaa60abeb6e3ad7ba854d6c40b37':
  Check permissions on getDeviceId.
 2015-12-17 15:13:36 -08: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
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
ef58df63d6 Merge "Check permissions on getDeviceId." into mnc-dr-dev 2015-12-17 22:52:58 +00:00
Bryce Lee
132814f20d 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.
 2015-12-17 19:51:17 +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
0ccc3a1cb5 Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b 
am: fc3762aafd

* commit 'fc3762aafd58ff9eada0b5ed261de20a40d7b07a':
  Add UUID to BluetoothHeadsetClientCall
 2015-12-17 00:20:34 +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
Adam Lesinski
1f7a36b8e6 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
 2015-12-16 23:35:17 +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
1d81716044 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
 2015-12-16 05:18:39 +00:00
Geoff Mendal
86c9eb83ce 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
 2015-12-16 05:17:12 +00: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
5b1b0a8224 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
 2015-12-16 05:05:55 +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
4cab51620b 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
 2015-12-16 04:54:38 +00:00
Geoff Mendal
b16da9aef2 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
 2015-12-16 04:53:01 +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
0750798334 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
 2015-12-15 20:45:33 -08: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
b295f8112c Import translations. DO NOT MERGE am: 22dea4e16f -s ours 
am: d8004c03d2  -s ours

* commit 'd8004c03d2c05d84e38ce3a5da88fd4b2c4e9681':
  Import translations. DO NOT MERGE
 2015-12-15 20:43:18 -08: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
Geoff Mendal
d2615bdf40 Import translations. DO NOT MERGE 
Change-Id: Ie93a6af2b483228b5797bdb018ac8accc7ef54ed
Auto-generated-cl: translation import
 2015-12-15 20:29:48 -08:00
Geoff Mendal
327d917865 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 04:26:04 +00:00
Geoff Mendal
695cf968b7 Import translations. DO NOT MERGE 
Change-Id: I28f308a8339779f14ccf90581665624317afb4d3
Auto-generated-cl: translation import
 2015-12-15 20:21:26 -08:00
Geoff Mendal
22dea4e16f Import translations. DO NOT MERGE 
Change-Id: I72a2242dff4a0d0c661bcdbc2ed2cca8dc38a89e
Auto-generated-cl: translation import
 2015-12-15 20:18:32 -08:00
Adam Lesinski
d5808d0d35 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
 2015-12-15 23:57:13 +00:00
Adam Lesinski
1d6d4c5a69 Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev 2015-12-15 23:52:43 +00:00
Adam Lesinski
5f8c8186ec 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)
 2015-12-15 22:12:10 +00:00
Adam Lesinski
7197bb49a7 Use wakeup reason when FingerPrint sensor wakes up the device 
am: 9289560aa0

* commit '9289560aa0d195dfed67dab05811114bc7bc88a9':
  Use wakeup reason when FingerPrint sensor wakes up the device
 2015-12-15 22:01:03 +00:00
Adam Lesinski
9289560aa0 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)
 2015-12-15 21:46:11 +00:00
Bryce Lee
4ab8b0696a Allow access to deprecated LOCK_PATTERN_ENABLED flag. am: 4614596a39 
am: 36393a5674

* commit '36393a5674bf50b351b5961a194ce2814ca00140':
  Allow access to deprecated LOCK_PATTERN_ENABLED flag.
 2015-12-14 23:57:38 +00:00