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

201410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jason Monk
1df7e13519 am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '41cfd3f8c0df036345807f87b828b4b68bdaffdf':
  Fix blank tiles on QS rotate
 2015-07-22 20:24:00 +00:00
Jason Monk
67091f46fa am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'a910a04b8a079a01d684266875eb18c318012de4':
  Fix crash in NetworkControllerImpl
 2015-07-22 20:23:55 +00:00
Jim Miller
4a31ee0a74 am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '091f0e5c6c7f9e72a6e661c4849a2e232823075b':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-22 20:23:41 +00:00
Svetoslav Ganov
010b53c029 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:23:28 +00:00
George Mount
27fbd360a8 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:23:02 +00:00
Jorim Jaggi
fcf9acb95a 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:22:56 +00:00
Adrian Roos
b30f841cb4 resolved conflicts for merge of c1244a29 to mnc-dr-dev 
Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139
 2015-07-22 12:00:56 -07:00
Geoff Mendal
1e06d4c64b am 5c080bd2: (-s ours) am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5c080bd2fb2d99724e1c0cec11fc1fe9d1cad597':
  Import translations. DO NOT MERGE
 2015-07-22 16:25:34 +00:00
Geoff Mendal
5c080bd2fb am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'c41e3191654d1b1e9df641da6aa7a8bf4f64b975':
  Import translations. DO NOT MERGE
 2015-07-22 16:09:47 +00:00
Geoff Mendal
c41e319165 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 15:56:29 +00:00
Geoff Mendal
fb91daa1c5 Import translations. DO NOT MERGE 
Change-Id: If03e28dba328619399e4f81a01283afbebd7d50d
Auto-generated-cl: translation import
 2015-07-22 10:42:52 -05: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
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
Svetoslav Ganov
bdb7d93651 Merge "Update permission icons to final versions - framework" into mnc-dev 2015-07-22 00:06:10 +00: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
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
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