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

208755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Steve McKay
30e743b607 Merge "Grid item fixups." 2015-07-24 01:44:11 +00:00
Steve McKay
d13f3c9742 Grid item fixups. 
Use margin instead of padding (so clicks on empty space don't do unexpected things).
Make background of items white.

Change-Id: I98996c90276911535b7addad1aad4a3c9ca47156
 2015-07-23 18:39:54 -07:00
Ying Wang
155f22692a am 82826fa8: am 802da28f: am 430c8c3e: Merge "Add phony source target in the generated dependency file of aidl." 
* commit '82826fa884b3eb4090ba0502dce9787c13ea8040':
  Add phony source target in the generated dependency file of aidl.
 2015-07-24 01:26:11 +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
Jun Mukai
9f5c66c6b3 Merge "Allow sticky immersive mode by mouse hover." 2015-07-24 00:43:21 +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
David Stevens
6323fff7df Merge "Add cmd to reset default component enabled setting" 2015-07-23 23:50:52 +00:00
Steve McKay
1bfa249e1f Merge "Allow Files app to be enabled via overlay." 2015-07-23 23:43:48 +00:00
David Stevens
f6ec60dd1e Add cmd to reset default component enabled setting 
Change-Id: Ice5e366643bb5c536b579089dcc98e06c9bb5645
 2015-07-23 16:42:29 -07:00
Steve McKay
1dfc482cc0 Allow Files app to be enabled via overlay. 
Actual changes to Andromeda overlay are in: http://ag/733602/

Change-Id: Iad5a4cb2d087d574613ba6e9c9c9c69bd8611e8c
 2015-07-23 16:41:31 -07:00
Stephen Hines
4c76dd3c13 am 4347a2af: am ed3ffe0f: am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel." 
* commit '4347a2af97da5cebb6d1a4a5350748e4a52066eb':
  RenderScript: implement a Script entry point for calling a reduce-style kernel.
 2015-07-23 23:11:06 +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
Tor Norbye
8a9f54932e Merge "Allow @RequiresPermission to be specified on parameters" 2015-07-23 22:39:14 +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
Tim Kilbourn
4663883245 am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev 
* commit 'a2bf7616044051769df86cf5f0bb4b21dedd5269':
  Add a wm command to dismiss the keyguard.
 2015-07-23 22:12:36 +00:00
Benjamin Franz
c36f6c4249 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-07-23 22:11:45 +00:00
Steve McKay
9c3ef68f8d Merge "Include padding in calculation of column count." 2015-07-23 22:09:59 +00:00
Zhentao Sun
ea6e001e31 am 6f52ee25: am e965289b: am f26a9a20: am c6cd1f9a: Added service that listens for gestures. 
* commit '6f52ee259201c320fe69004623efd1748874f628':
  Added service that listens for gestures.
 2015-07-23 22:08:05 +00:00
Adrian Roos
3ad8a7840b am a1d61552: am 2f1220c4: am 2237c32f: am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit 'a1d61552f99bfa4720bf3f51d10adfe2b16c5dc6':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 22:07:58 +00:00
Fred Chung
8e3b55aa68 am 386ad3c9: 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 '386ad3c9ca122018707107dad3d70dcfd6b56d35':
  Doc change: add note about not exiting on onPause().
 2015-07-23 22:07:49 +00:00
Dianne Hackborn
bf822d39a2 am c9e454a5: am 26b2453c: am d363399b: am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit 'c9e454a544233b6d4d7ae96d4442505bbad22fcb':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 22:07:41 +00:00
Alex Klyubin
f93f1f3617 am 05984f76: 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 '05984f7627f4aa5a7c12ef33f9895ad16fcb5de1':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-23 22:07:33 +00:00
Wale Ogunwale
5a452cdad3 am c4597a90: am 6cd07625: am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'c4597a90f97e577afba22400f53e76eff181090c':
  Fixed issue with not finding existing activity for background user
 2015-07-23 22:07:25 +00:00
Kenny Guy
273639f7ad am e6b1e0e1: am 72be5067: am af52ae07: am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit 'e6b1e0e1c22d57b8c3f70e780fdc672175780086':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 22:07:18 +00:00
Jason Monk
383749d97b am 85ce138d: am 1a2f8f7c: am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '85ce138d5e7555df0aa95541f09f776c28fd3860':
  Fix blank tiles on QS rotate
 2015-07-23 22:07:11 +00:00
Jason Monk
b734e4a84b am d621727d: am 76d79fb0: am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'd621727d0b785a69dda64ff6f87f52b3aea6014e':
  Fix crash in NetworkControllerImpl
 2015-07-23 22:07:04 +00:00
Jim Miller
d099d878dd am a7bc2e0a: am 8c98f386: am 8cc0e80f: am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit 'a7bc2e0aef1888f779011147e355e858b8e79eae':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 22:06:56 +00:00
Svetoslav Ganov
7b97b23329 am 6ae3ec45: am d14cbeab: am 8276a97f: am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit '6ae3ec45352b5ef54366150f68d1c44994f52657':
  Update permission icons to final versions - framework
 2015-07-23 22:06:48 +00:00
George Mount
b8eb74989e am d2546854: am 44543451: am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit 'd254685497e95ba0f921ed3a4e69636008c7e129':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 22:06:38 +00:00
Jorim Jaggi
ffbc117229 am f30c5f56: am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'f30c5f56187fed6452d557a44df8b63d8eb130a2':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 22:06:29 +00:00
Adrian Roos
5e2447b903 am aebb144b: am e674e950: am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'aebb144b3c2651f19109c8f70f809e6e9f1a2e49':
  Touch, wake and unlock
 2015-07-23 22:06:21 +00:00
Svetoslav Ganov
54f1db7932 am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev 
* commit '607bc34f93a8c074d1982861273d210291eae34d':
  Reset permissions and app links when clearing app preferences - framework
 2015-07-23 22:01:20 +00:00
Svetoslav Ganov
f9044dcc27 am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev 
* commit '258e630a6bc876c57ac97c6da3e5414d0e7eb036':
  Shut down UiAutomationConnection without a lock held
 2015-07-23 22:01:14 +00:00
Tim Kilbourn
a2bf761604 Merge "Add a wm command to dismiss the keyguard." into mnc-dev 2015-07-23 21:58:01 +00:00
Tim Kilbourn
f40c66d1a1 Add a wm command to dismiss the keyguard. 
If the user has a screen lock, the user is prompted to authenticate.
Otherwise the keyguard is dismissed.

Bug: 22694837
Change-Id: I783fc6f08fb21977aa4f1e884b0a4354a3154805
 2015-07-23 14:51:41 -07: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