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

201499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
602d71db2e am 898e3dda: am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit '898e3dda949f305a64e249b1571a9b5d2853887b':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-24 03:35:26 +00:00
Nick Kralevich
01e00c8ce0 am e4f10de7: am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 
* commit 'e4f10de7d2170b319dc987c1cd4e2ad3c464ead9':
  UsbDeviceManager: fix b/21429947 regression
 2015-07-24 03:35:19 +00:00
Chris Wren
99547e494a am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev 
* commit 'b86df334f778eecbf4beaaa9127e7e523e55fb6c':
  Don't crash sysui when advisory calls fail.
 2015-07-24 03:35:13 +00:00
Tim Kilbourn
d8f08d651f am cd03be66: am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev 
* commit 'cd03be66e86d43ac64e487826b27e9c2c9a5b634':
  Miss USB device Interface from UsbManager.getDeviceList().
 2015-07-24 03:35:07 +00:00
Alan Viverette
35b1674a24 am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit '9b4917a6f8ccd3a9faac08859d263f58e33f6357':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-24 03:35:00 +00:00
Fyodor Kupolov
5192e4b2c0 am 030f2735: am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit '030f273550eb0f0f53c43c3852d40433a0315649':
  Added a note about location permission
 2015-07-24 03:34:53 +00:00
xin He
b76cc9105d am 4a4e0647: am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 
* commit '4a4e06477b9af816c15c2a212f028053285df5ef':
  Angler Should Not Use Channel 11 for SoftAP
 2015-07-24 03:34:47 +00:00
Jeff Sharkey
aebcf3b7ef am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit '23fdb6355ee4cc1230d88447d3925f2b504e4f4e':
  More info to support CTS, fix reconcile bug.
 2015-07-24 03:34:41 +00:00
Jason Monk
dea13a9623 am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'c063146fb2de35908183a52b2ff50934ad40c653':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 03:34:32 +00:00
Jorim Jaggi
929a82c81f am a0d142d9: am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit 'a0d142d9425e542b58721cbfcf7a032e7c503521':
  Partially fix that beginning of animation is skipped
 2015-07-24 03:34:25 +00:00
Dianne Hackborn
14aca8e87a am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '63ff4a77f35d578f2c543cefeb0e6175365c60bb':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 03:34:19 +00:00
Adam Lesinski
898e3dda94 am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit '92638a0ca9c7c2125c624e457e79088b9892d4e0':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-24 03:06:22 +00:00
Nick Kralevich
e4f10de7d2 am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 
* commit 'dd856a3f0df6e076b815ae208f000e28de235353':
  UsbDeviceManager: fix b/21429947 regression
 2015-07-24 03:06:14 +00:00
Chris Wren
b86df334f7 am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev 
* commit 'e6deaca693c530f7cc3298efc2c53849b9e6cd01':
  Don't crash sysui when advisory calls fail.
 2015-07-24 03:06:09 +00:00
Tim Kilbourn
cd03be66e8 am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev 
* commit 'ad49498e91883099ffda2155e96ebaf495ba579a':
  Miss USB device Interface from UsbManager.getDeviceList().
 2015-07-24 03:06:04 +00:00
Alan Viverette
9b4917a6f8 am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit 'be01800d76ac786a4617e1cecac71c297acf23e4':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-24 03:05:58 +00:00
Fyodor Kupolov
030f273550 am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit '2a37b2fff27c67454a59048c286b2a7e6329eb07':
  Added a note about location permission
 2015-07-24 03:05:53 +00:00
xin He
4a4e06477b am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 
* commit '13bb68122fae6cded11e576c41a81cd2baffb3f7':
  Angler Should Not Use Channel 11 for SoftAP
 2015-07-24 03:05:47 +00:00
Jeff Sharkey
23fdb6355e am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'e87dc6dba58e55c60f387a86468a57a5109a97ac':
  More info to support CTS, fix reconcile bug.
 2015-07-24 03:05:42 +00:00
Jason Monk
c063146fb2 am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit '72548325019cc168a5d98fe7de93dc9ee679a4b7':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 03:05:33 +00:00
Jorim Jaggi
a0d142d942 am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit '5091ca9c825c32336ce42d7b70eef323ddb9cb3c':
  Partially fix that beginning of animation is skipped
 2015-07-24 03:05:28 +00:00
Dianne Hackborn
63ff4a77f3 am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '419f2177c8565f80489d00463aea630568251f4d':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 03:05:22 +00:00
Zhentao Sun
e965289b57 am f26a9a20: am c6cd1f9a: Added service that listens for gestures. 
* commit 'f26a9a20ae6ad03022cb01643415b67152f90ab7':
  Added service that listens for gestures.
 2015-07-23 19:48:57 +00:00
Adrian Roos
2f1220c419 am 2237c32f: am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '2237c32fe1dfcd13056970ff987ee92326aee5c1':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 19:48:51 +00:00
Fred Chung
fd7db2095c am a201140b: am 9478ddfa: am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit 'a201140bb42c77adaf8714f05d7c2341690e4445':
  Doc change: add note about not exiting on onPause().
 2015-07-23 19:48:44 +00:00
Dianne Hackborn
26b2453ca4 am d363399b: am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit 'd363399b97c57d573eade7ff757b17c8257a5b83':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 19:48:38 +00:00
Alex Klyubin
3ad847959e am b1d68c90: am 568e67a3: am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit 'b1d68c90f09d97ba7988ba061906ab286978dcad':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-23 19:48:31 +00:00
Wale Ogunwale
6cd07625ec am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit '1aaf7d6cb9e88876879a7b8fbfc51c2c97bca82d':
  Fixed issue with not finding existing activity for background user
 2015-07-23 19:48:25 +00:00
Kenny Guy
72be506795 am af52ae07: am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit 'af52ae07eee76f99c64ecd6346f3c6a9d4d77f20':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 19:48:19 +00:00
Jason Monk
1a2f8f7c11 am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '3260194f206e90508b01d2fc0187516c940fbd0c':
  Fix blank tiles on QS rotate
 2015-07-23 19:48:13 +00:00
Jason Monk
76d79fb097 am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'f91bc8709f95d8a69d9b95fadf9066eff6223a7d':
  Fix crash in NetworkControllerImpl
 2015-07-23 19:48:06 +00:00
Jim Miller
8c98f38676 am 8cc0e80f: am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '8cc0e80f06f98025b88e581025a2bec85f03cdd9':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 19:48:00 +00:00
Svetoslav Ganov
d14cbeabbc am 8276a97f: am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit '8276a97fceed62cd30e9f41af1e4e96b49c619ca':
  Update permission icons to final versions - framework
 2015-07-23 19:47:54 +00:00
George Mount
4454345120 am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit 'c2c3eacb4c41d5eff0a53be1f4e6dc94d8928300':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 19:47:48 +00:00
Jorim Jaggi
93a25f77bb am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'fba926118ed7d5465cb6e7b64d29153212f7cbee':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 19:47:40 +00:00
Adrian Roos
e674e9500c am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit '9fb98375e80e4b70fe8a5ea2e0cd0e9a6cc6f5c1':
  Touch, wake and unlock
 2015-07-23 19:47:35 +00:00
Zhentao Sun
f26a9a20ae am c6cd1f9a: Added service that listens for gestures. 
* commit 'c6cd1f9a83b2807ef7434b6775a07e1e9208d4e0':
  Added service that listens for gestures.
 2015-07-23 19:21:29 +00:00
Adrian Roos
2237c32fe1 am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '58adc7ad48990f2ffa0d4858bd6910dd9eb6aabc':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 19:21:24 +00:00
Fred Chung
a201140bb4 am 9478ddfa: am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit '9478ddfa11a2f16e3234d4c6251fffa0d8527936':
  Doc change: add note about not exiting on onPause().
 2015-07-23 19:21:19 +00:00
Dianne Hackborn
d363399b97 am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit '863504111546fb46fcb5af356efb267c8582018a':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 19:21:14 +00:00
Alex Klyubin
b1d68c90f0 am 568e67a3: am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit '568e67a322deb027480fb85e6d4082b78d907d57':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-23 19:21:07 +00:00
Wale Ogunwale
1aaf7d6cb9 am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'aecf9ba839d440fb89055bcb8454cf72d0afaf41':
  Fixed issue with not finding existing activity for background user
 2015-07-23 19:21:02 +00:00
Kenny Guy
af52ae07ee am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit '2adcb40d2ce3706543f3e545ce93e9231b94971c':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 19:20:57 +00:00
Jason Monk
3260194f20 am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '1df7e135196ca3c8a6a51a9b741e12782afa039c':
  Fix blank tiles on QS rotate
 2015-07-23 19:20:53 +00:00
Jason Monk
f91bc8709f am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit '67091f46fa16537563a6c095a5bd044499bc2ea5':
  Fix crash in NetworkControllerImpl
 2015-07-23 19:20:48 +00:00
Jim Miller
8cc0e80f06 am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '4a31ee0a745e048a2c9c4db1444404373c1d606b':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 19:20:41 +00:00
Svetoslav Ganov
8276a97fce am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit '010b53c029eac203c445d81ecfca01c242111365':
  Update permission icons to final versions - framework
 2015-07-23 19:20:37 +00:00
George Mount
c2c3eacb4c am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '27fbd360a8256cf6321da9ba29bab02b3d241aba':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 19:20:32 +00:00
Jorim Jaggi
fba926118e am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'fcf9acb95a536f939a418529f642e60f51f5886a':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 19:20:27 +00:00
Adrian Roos
9fb98375e8 am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'b30f841cb44e132598939b0797dad41f6c0004a7':
  Touch, wake and unlock
 2015-07-23 19:20:22 +00:00