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
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
Geoff Mendal
1ac9628c97 am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '8d5ed661f060e3d915f3f1f593f2f87ebd1285cc':
  Import translations. DO NOT MERGE
 2015-07-22 14:19:11 +00:00
Geoff Mendal
5cae0cded7 am a88427c3: (-s ours) am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'a88427c34729368766593fc2a8864b5383e907cc':
  Import translations. DO NOT MERGE
 2015-07-22 14:19:05 +00:00
Geoff Mendal
069bf3c2a4 am 234bd0f4: (-s ours) am b568f3fd: (-s ours) Import translations. DO NOT MERGE 
* commit '234bd0f46c9d75240906fa021b8c4975a34c9c10':
  Import translations. DO NOT MERGE
 2015-07-22 14:19:00 +00:00
Geoff Mendal
8d5ed661f0 am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '920e8be69db7cd24a9c5566b95686a6b714447e9':
  Import translations. DO NOT MERGE
 2015-07-22 14:03:58 +00:00
Geoff Mendal
a88427c347 am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'e573ee63b7a89b121ad36af883c2731d118f4794':
  Import translations. DO NOT MERGE
 2015-07-22 14:03:54 +00:00
Geoff Mendal
234bd0f46c am b568f3fd: (-s ours) Import translations. DO NOT MERGE 
* commit 'b568f3fdc935c9a185b7cf8f462567a6be97b900':
  Import translations. DO NOT MERGE
 2015-07-22 14:03:50 +00:00
Geoff Mendal
920e8be69d Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 13:58:09 +00:00
Geoff Mendal
e292d5b86e Import translations. DO NOT MERGE 
Change-Id: If222f66dff503d3b3f0349d76fd082a6780414d7
Auto-generated-cl: translation import
 2015-07-22 06:53:49 -07:00
Geoff Mendal
e573ee63b7 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 13:51:43 +00:00
Geoff Mendal
7f722ede33 Import translations. DO NOT MERGE 
Change-Id: I064668ffb91d718c0981ecd0f221e5f3b0d364d7
Auto-generated-cl: translation import
 2015-07-22 06:50:26 -07:00
Geoff Mendal
b568f3fdc9 Import translations. DO NOT MERGE 
Change-Id: I51a4605c050aab170712962b4cc2a7df7ca9174d
Auto-generated-cl: translation import
 2015-07-22 06:49:42 -07: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
Dianne Hackborn
451c3468b9 Fix issue #22612630: Ensure SMS/Call delivery during Doze 
Add whitelist timeout for SMS.

Change-Id: I3392093000ad177a93b6ef36fb18f0398a671423
 2015-07-21 17:39:46 -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
Adrian Roos
76dc5a51cd Send BATTERY_CHANGED if maxChargingCurrent changes 
Fixes a bug where the charging current on Keyguard was stale
on devices that don't immediately set the charging current.

Follow-up to I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36

Bug: 8099739
Change-Id: I4b5b3b1231b1372310206941386dba743d5f88f4
 2015-07-21 16:20:39 -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
Jeff Sharkey
b109b1349a am 934995ed: am b020b0d9: am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit '934995ede49b1b4bd8178cd44b1c0f338356982e':
  Avoid NPE when no staged installs.
 2015-07-21 22:07:17 +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
934995ede4 am b020b0d9: am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit 'b020b0d97d80f0ebb550ce58a5b36787cfcf6df8':
  Avoid NPE when no staged installs.
 2015-07-21 21:52:57 +00:00
Jeff Sharkey
b020b0d97d am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit 'cf051d1846c347413d8c907b42f3fce74795a815':
  Avoid NPE when no staged installs.
 2015-07-21 21:36:56 +00:00
John Reck
3bfe4b47c7 am 1cd5afc1: am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '1cd5afc135b0aea3249219fcfb393d9bd9b53ec2':
  Mark isInUse per-window
 2015-07-21 21:32:43 +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
Fyodor Kupolov
5211528b9d am 67cd2fc5: am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit '67cd2fc5eb92dd1fb2fe6621d3d1d4dd33f199ce':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 21:19:50 +00:00
John Reck
1cd5afc135 am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '9317d0b9904573bdb0d815ec563dd263447f11db':
  Mark isInUse per-window
 2015-07-21 21:19:47 +00:00
Fyodor Kupolov
67cd2fc5eb am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit 'cf6500b9bae461107d5c0c58de511df907d19fb3':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 21:05:01 +00:00
John Reck
9317d0b990 am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7':
  Mark isInUse per-window
 2015-07-21 21:04:45 +00:00
John Reck
1fddd3efa9 Merge "Mark isInUse per-window" into mnc-dev 2015-07-21 20:50:30 +00:00
Fyodor Kupolov
cf6500b9ba 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:50:24 +00:00
Amith Yamasani
aef8716ed9 am b82c71a8: am 89d4131d: am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit 'b82c71a893cef1f18539ae48aafcca170809cc18':
  Don't kill apps that are multi-user aware...
 2015-07-21 20:46:58 +00:00
Alex Klyubin
e7d360c32e am a3686e4b: am a69e72c5: am 5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev 
* commit 'a3686e4b388f174b2a952fee9e3d8e9b39eb47e4':
  KM module may consume less input than provided by finish time.
 2015-07-21 20:33:42 +00:00
Amith Yamasani
b82c71a893 am 89d4131d: am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit '89d4131d75cc4c89e3fb36115be929837c9a3171':
  Don't kill apps that are multi-user aware...
 2015-07-21 20:33:07 +00:00
Fyodor Kupolov
55a116d00c Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 2015-07-21 20:32:28 +00:00
Alex Klyubin
a3686e4b38 am a69e72c5: am 5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev 
* commit 'a69e72c54786d2e3a585162b3bd71f325a1a6865':
  KM module may consume less input than provided by finish time.
 2015-07-21 20:18:03 +00:00
Amith Yamasani
89d4131d75 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:18:02 +00:00
Adam Lesinski
e1cd38e929 am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit 'ca34b18481084b67fc690ee9c64301f785756dde':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 20:08:37 +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
a69e72c547 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
Adam Lesinski
ca34b18481 am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit 'a50f43e0028ec174827e73d1e45666b8e694808f':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 19:54:24 +00:00
Christopher Tate
8f9a223e2f am 22fac49a: am 6391a8d4: am d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev 
* commit '22fac49a7be4e51de31287156885aa76a568c979':
  Add 'pm' operation to set a package's app-linking state
 2015-07-21 19:53:53 +00:00