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

204890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
bb8b0368c5 am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'dea13a962356e54881c3924fc07c1aed97a97f46':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 04:01:38 +00:00
Jorim Jaggi
b3544372ba am 929a82c8: am a0d142d9: am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit '929a82c81fe778319f04b03e73328724528c8521':
  Partially fix that beginning of animation is skipped
 2015-07-24 04:01:30 +00:00
Dianne Hackborn
1d8b0a29ab am 14aca8e8: am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '14aca8e87a3dc6e8fa783b3c45718a81f9f5e67a':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 04:01:24 +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
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
Ying Wang
82826fa884 am 802da28f: am 430c8c3e: Merge "Add phony source target in the generated dependency file of aidl." 
* commit '802da28f22f2869c810531b95ac90f7fa446df93':
  Add phony source target in the generated dependency file of aidl.
 2015-07-24 01:11:06 +00:00
Ying Wang
802da28f22 am 430c8c3e: Merge "Add phony source target in the generated dependency file of aidl." 
* commit '430c8c3e48b361f75d29d05b8fda3aac22ceb1f9':
  Add phony source target in the generated dependency file of aidl.
 2015-07-24 00:54:53 +00:00
Ying Wang
430c8c3e48 Merge "Add phony source target in the generated dependency file of aidl." 2015-07-24 00:38:08 +00:00
Stephen Hines
4347a2af97 am ed3ffe0f: am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel." 
* commit 'ed3ffe0fc86de016ff2b4231e2fcc74a6119f6c7':
  RenderScript: implement a Script entry point for calling a reduce-style kernel.
 2015-07-23 22:54:06 +00:00
Stephen Hines
ed3ffe0fc8 am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel." 
* commit '6430812a9381af01b0c7b48cedd6a11c1add6942':
  RenderScript: implement a Script entry point for calling a reduce-style kernel.
 2015-07-23 22:39:29 +00:00
Stephen Hines
6430812a93 Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel." 2015-07-23 22:26:05 +00:00
Zhentao Sun
6f52ee2592 am e965289b: am f26a9a20: am c6cd1f9a: Added service that listens for gestures. 
* commit 'e965289b57eb1782580bc5a6bc153d508b7176be':
  Added service that listens for gestures.
 2015-07-23 21:50:08 +00:00
Adrian Roos
a1d61552f9 am 2f1220c4: am 2237c32f: am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '2f1220c419492825fd0d1b47f77b36d10afea6a7':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 21:50:01 +00:00
Fred Chung
386ad3c9ca am fd7db209: 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 'fd7db2095c9a0247e0d859e1437b6181af45eec7':
  Doc change: add note about not exiting on onPause().
 2015-07-23 21:49:56 +00:00
Dianne Hackborn
c9e454a544 am 26b2453c: am d363399b: am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit '26b2453ca48b23177b8d692e3b1f9529a869211c':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 21:49:50 +00:00
Alex Klyubin
05984f7627 am 3ad84795: am b1d68c90: am 568e67a3: am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit '3ad847959e916c68d879d0cb127350ce524ec0a2':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-23 21:49:42 +00:00
Wale Ogunwale
c4597a90f9 am 6cd07625: am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit '6cd07625ece8a89ac01a958eb082bdb58ccfbc97':
  Fixed issue with not finding existing activity for background user
 2015-07-23 21:49:36 +00:00
Kenny Guy
e6b1e0e1c2 am 72be5067: am af52ae07: am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit '72be506795c4b7260612458c183282b9c59717ef':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 21:49:30 +00:00
Jason Monk
85ce138d5e am 1a2f8f7c: am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '1a2f8f7c117c9b2377827a73043928b9d86eb550':
  Fix blank tiles on QS rotate
 2015-07-23 21:49:22 +00:00
Jason Monk
d621727d0b am 76d79fb0: am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit '76d79fb097c2cb0731c67457f3f0cd72237c01e8':
  Fix crash in NetworkControllerImpl
 2015-07-23 21:49:13 +00:00
Jim Miller
a7bc2e0aef am 8c98f386: am 8cc0e80f: am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '8c98f38676d9da5df54f7819d9391beb802ce0ec':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 21:49:07 +00:00
Svetoslav Ganov
6ae3ec4535 am d14cbeab: am 8276a97f: am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit 'd14cbeabbc6fba855161f07cfe0b9abf910d6d4e':
  Update permission icons to final versions - framework
 2015-07-23 21:49:01 +00:00
George Mount
d254685497 am 44543451: am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '44543451206a107934c9c74ed5a53d43d73070e8':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 21:48:55 +00:00
Jorim Jaggi
f30c5f5618 am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 21:48:48 +00:00
Adrian Roos
aebb144b3c am e674e950: am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'e674e9500c723848e896d281fc4bf45285689170':
  Touch, wake and unlock
 2015-07-23 21:48:42 +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