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

203341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
6f1e3c56a7 am bbcc914b: am 01efd7e8: Merge "Use build_number from file" 
* commit 'bbcc914b18a5b2ea57e25e6e79336c5c75d49421':
  Use build_number from file
 2015-07-23 19:01:39 +00:00
Colin Cross
bbcc914b18 am 01efd7e8: Merge "Use build_number from file" 
* commit '01efd7e820edb9677491f28af999d825f21711a4':
  Use build_number from file
 2015-07-23 18:48:22 +00:00
Colin Cross
01efd7e820 Merge "Use build_number from file" 2015-07-23 18:23:06 +00:00
Elliott Hughes
0817e20867 am f9a82218: am 86d5fc28: Merge "aapt: expat exports its header files now." 
* commit 'f9a8221810a0b5aaa4050becaa0aa9d492035ff3':
  aapt: expat exports its header files now.
 2015-07-23 02:06:52 +00:00
Fred Chung
f60ecd4413 am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit 'db71828cb7bff983bd758e986b65731cb0a5b2f6':
  Doc change: add note about not exiting on onPause().
 2015-07-22 20:19:56 +00:00
Dianne Hackborn
dd400d6a54 am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit 'b73946715cb9e3ca7a2702407e34f885e92a5d9a':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-22 20:19:09 +00:00
Alex Klyubin
f609383314 am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit 'ada70be897fb7541129f1ab1f6faa94a80fca986':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-22 20:18:57 +00:00
Wale Ogunwale
5e92327deb am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'ff21279e2cbe0bdd9c41350b7a204cabf9370377':
  Fixed issue with not finding existing activity for background user
 2015-07-22 20:18:42 +00:00
Kenny Guy
8ea8c98a1f am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit '2ba3fec6e0222754d93ed7a491354164d113ad6e':
  Support waiting for adb shell am stop-user to complete.
 2015-07-22 20:18:35 +00:00
Jason Monk
350edb81bf am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '41cfd3f8c0df036345807f87b828b4b68bdaffdf':
  Fix blank tiles on QS rotate
 2015-07-22 20:18:26 +00:00
Jason Monk
6fbfcbaf9d am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'a910a04b8a079a01d684266875eb18c318012de4':
  Fix crash in NetworkControllerImpl
 2015-07-22 20:18:19 +00:00
Jim Miller
cd081547ef am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '091f0e5c6c7f9e72a6e661c4849a2e232823075b':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-22 20:18:03 +00:00
Svetoslav Ganov
d7a3e7b330 am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit 'bdb7d936512a39b6c06411d11a26824b82e5727f':
  Update permission icons to final versions - framework
 2015-07-22 20:17:49 +00:00
George Mount
246ede1b9c am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '7c482463cbea39cdbf2c3c8f481d82711cf0475b':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-22 20:17:21 +00:00
Jorim Jaggi
3bda57a05f am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '20df62345910ad390a3bb321990987757db0831d':
  Add callback to voice interaction session for lockscreen shown
 2015-07-22 20:17:14 +00:00
Jorim Jaggi
7840c0a071 am c1244a29: Merge "Touch, wake and unlock" into mnc-dev 
* commit 'c1244a2995087c930842b7d5e5a35a446c5c40f7':
  Touch, wake and unlock
 2015-07-22 20:16:55 +00:00
Fred Chung
db71828cb7 am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit '2c3b9fb86b9fb26b01fe5af2067f6513bf06acf3':
  Doc change: add note about not exiting on onPause().
 2015-07-22 17:46:21 +00:00
Dianne Hackborn
b73946715c Merge "Work on issue #22303510: Additional permissions aren't properly..." into mnc-dev 2015-07-22 16:14:59 +00:00
Alex Klyubin
ada70be897 Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 2015-07-22 15:24:27 +00:00
Wale Ogunwale
ff21279e2c Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 2015-07-22 14:21:31 +00:00
Kenny Guy
2ba3fec6e0 Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 2015-07-22 13:49:20 +00:00
Jason Monk
41cfd3f8c0 Merge "Fix blank tiles on QS rotate" into mnc-dev 2015-07-22 12:56:40 +00:00
Jason Monk
a910a04b8a Merge "Fix crash in NetworkControllerImpl" into mnc-dev 2015-07-22 12:54:20 +00:00
Jim Miller
091f0e5c6c Make FingerprintService more tolerant of fingerprintd crashes. 
- attempt to restart fingerprintd on the next request
- inform clients that the hardware isn't available and cancel
listeners.

Fixes bug 22492148

Change-Id: Ib27eaf7f197c6a4e6ed9b085602882904d6b794d
 2015-07-22 04:07:29 +00:00
Elliott Hughes
f9a8221810 am 86d5fc28: Merge "aapt: expat exports its header files now." 
* commit '86d5fc2874b4c17bd4f48ae307e49ba8108e11f0':
  aapt: expat exports its header files now.
 2015-07-22 01:12:36 +00:00
Elliott Hughes
86d5fc2874 Merge "aapt: expat exports its header files now." 2015-07-22 01:00:11 +00:00
Elliott Hughes
b48adad2ed aapt: expat exports its header files now. 
(cherrypick of 51348d2007b801c7bd7350f72e2300f1a5a41dd1)
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
 2015-07-21 17:25:01 -07:00
Svetoslav Ganov
bdb7d93651 Merge "Update permission icons to final versions - framework" into mnc-dev 2015-07-22 00:06:10 +00:00
Wale Ogunwale
25073dd4a8 Fixed issue with not finding existing activity for background user 
We currently go through the list of existing activities to find
a match for the launching intent so we can re-use the activity
record if one already exist. However, we exit the search early
once we run across an activity record that doesn't belong to the
current foreground user. This will cause us to create duplicate
activity records if the launching intent is for a backround
user and an activity record already exist.

Based on https://android-review.googlesource.com/#/c/159131

Bug: 22564256
Change-Id: I4b6d94059c11fd2e621e65c8ec2c99427c15b246
 2015-07-22 00:05:39 +00:00
Dianne Hackborn
cfbfafe1b9 Work on issue #22303510: Additional permissions aren't properly... 
...disabled after toggling them off

Keep track of whether a permission that has been declared by an app
was able to actually be installed in the system, along with an API
to find this information so that system UI can tell whether that
permission is of interest.

Also clean up some of the permission debug output.

Change-Id: If4541bedb857789b255bb18f03cad155dcda0b95
 2015-07-21 17:01:15 -07:00
George Mount
7c482463cb Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 2015-07-21 22:51:27 +00:00
Jorim Jaggi
20df623459 Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 2015-07-21 22:46:30 +00:00
Fred Chung
2c3b9fb86b am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit '3ccbf3bad50c47409de9570c422756f9e3fa518a':
  Doc change: add note about not exiting on onPause().
 2015-07-21 22:16:55 +00:00
Fred Chung
3ccbf3bad5 Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 2015-07-21 22:06:15 +00:00
Jorim Jaggi
c1244a2995 Merge "Touch, wake and unlock" into mnc-dev 2015-07-21 21:53:11 +00:00
Jeff Sharkey
71395ee8ef am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit 'cf051d1846c347413d8c907b42f3fce74795a815':
  Avoid NPE when no staged installs.
 2015-07-21 21:38:32 +00:00
George Mount
13d7032d59 Null checks to prevent NPEs in Fragments transactions. 
Bug 22631964

Change-Id: I20bc80bfb0ba5f1081d1c349b94db7c5475bcc51
 2015-07-21 14:30:24 -07:00
Jeff Sharkey
cf051d1846 Merge "Avoid NPE when no staged installs." into mnc-dev 2015-07-21 21:23:59 +00:00
John Reck
0ccb23e4be am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7':
  Mark isInUse per-window
 2015-07-21 21:01:45 +00:00
John Reck
1fddd3efa9 Merge "Mark isInUse per-window" into mnc-dev 2015-07-21 20:50:30 +00:00
Fyodor Kupolov
4dee174f72 am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit '55a116d00ca3f7b84a6af1c5c3472323ad5bc6ca':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 20:47:45 +00:00
Elliott Hughes
1de146ac4f Merge "aapt: expat exports its header files now." into mnc-dev-plus-aosp 2015-07-21 20:38:18 +00:00
Fyodor Kupolov
55a116d00c Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 2015-07-21 20:32:28 +00:00
Amith Yamasani
3bdc094014 am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit '09ba71513ba3bb092eb3effbe45953c50430ff20':
  Don't kill apps that are multi-user aware...
 2015-07-21 20:16:18 +00:00
Amith Yamasani
09ba71513b Merge "Don't kill apps that are multi-user aware..." into mnc-dev 2015-07-21 20:04:22 +00:00
Alex Klyubin
dc90c5c335 am 5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev 
* commit '5d586dd585a6663290b68abce433a75b5760fc5d':
  KM module may consume less input than provided by finish time.
 2015-07-21 20:02:21 +00:00
Colin Cross
06e04f7671 Use build_number from file 
Improve incremental ninja builds by keeping the command line the same
across builds.

Change-Id: If9dfcee74a4d282c183f9669e14a89104c115a71
 2015-07-21 12:55:13 -07:00
Alex Klyubin
5d586dd585 Merge "KM module may consume less input than provided by finish time." into mnc-dev 2015-07-21 19:50:50 +00:00
Adam Lesinski
bbd86a4b2b am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit '23e19066de2caf1db1fa0759ac49a1118b59f7a5':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 19:41:06 +00:00
Jorim Jaggi
19695d9711 Add callback to voice interaction session for lockscreen shown 
Bug: 22402726
Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
 2015-07-21 12:35:16 -07:00