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

18696 Commits

Author SHA1 Message Date
Elliott Hughes
ea1831d211 am b57dd722: resolved conflicts for a884d81e to stage-aosp-master 
* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
  constify JNINativeMethod function pointer tables
 2015-09-24 17:14:10 +00:00
Elliott Hughes
b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master 
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
 2015-09-24 10:01:32 -07:00
Jorim Jaggi
8ba8c543f7 am b278ea0c: am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev 
* commit 'b278ea0cab555f16d0d8278ee3eadf75c6266920':
  Update message in SIM PIN view when configuration changes
 2015-09-24 02:41:36 +00:00
Jorim Jaggi
b278ea0cab am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev 
* commit '27f26df629e7a5c2ea87ad46708dc4678c11d27a':
  Update message in SIM PIN view when configuration changes
 2015-09-24 02:29:01 +00:00
Jorim Jaggi
27f26df629 am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev 
* commit '05b11bf357be9546a2cbdd3f37c32fc9567f4767':
  Update message in SIM PIN view when configuration changes
 2015-09-24 02:20:37 +00:00
Jorim Jaggi
05b11bf357 Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev 2015-09-24 00:23:47 +00:00
Jorim Jaggi
93d1a17baf am 1af3c6f4: am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility 
* commit '1af3c6f401da0ab8c4ddefd3e1776f9be50a1389':
  Do not go over handler to dispatch keyguard visibility
 2015-09-23 19:12:41 +00:00
Jorim Jaggi
1af3c6f401 am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility 
* commit '1bcb3472669529edc991a31e6cbf7866a385383e':
  Do not go over handler to dispatch keyguard visibility
 2015-09-23 19:03:26 +00:00
Jorim Jaggi
1bcb347266 am 6a15d528: Do not go over handler to dispatch keyguard visibility 
* commit '6a15d528c0a4501389008ef945dec38b5ca6919a':
  Do not go over handler to dispatch keyguard visibility
 2015-09-23 18:55:38 +00:00
Jorim Jaggi
ad371b2e22 Update message in SIM PIN view when configuration changes 
Bug: 24273807
Change-Id: I497fcd2ee527ec22d14ff1b6c30be4ef9a878980
 2015-09-23 11:52:12 -07:00
Jorim Jaggi
6a15d528c0 Do not go over handler to dispatch keyguard visibility 
When going over the handler, it could happen with a bad interleaving
we thought that Keyguard was not showing when getting the
onFinishedGoingToSleep message, so we stopped fingerprint
authentication. For some reason our state machine for canceling
/restarting authentication didn't work correctly so the fingerprint
listening state was not correct.

Bug: 24178814
Change-Id: I2a4731f195982395244c12e4d33b2b7d561c5671
 2015-09-23 18:44:20 +00:00
Baligh Uddin
9c5e49b713 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-23 14:15:57 +00:00
Baligh Uddin
18daf48f1a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-23 14:15:31 +00:00
Baligh Uddin
d213d28807 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-23 14:15:25 +00:00
Baligh Uddin
a6928d4d26 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-23 14:12:25 +00:00
Baligh Uddin
4b23a8149b Import translations. DO NOT MERGE 
Change-Id: I1e80237aa0c299f831687de31cb85cf2658d3f3f
Auto-generated-cl: translation import
 2015-09-23 01:54:57 -07:00
Baligh Uddin
3730fa2756 Import translations. DO NOT MERGE 
Change-Id: If4dc7584743f13b1c0c8661b483af51cc10101a3
Auto-generated-cl: translation import
 2015-09-23 01:44:04 -07:00
Baligh Uddin
c5c9bdb08d Import translations. DO NOT MERGE 
Change-Id: I7c5c75590f30ee06cd8171bffb04da5073c394dc
Auto-generated-cl: translation import
 2015-09-23 01:31:31 -07:00
Justin Harrison
b869cbe75a am e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev 
* commit 'e2153b9741c7d9c3910c9355ae3bf6ec4f5c231b':
  Extended the maximum pulsing duration when dozing
 2015-09-23 06:25:34 +00:00
Justin Harrison
e2153b9741 am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev 
* commit '184440cea399d2332b5dc138a9e8a47e9cde3398':
  Extended the maximum pulsing duration when dozing
 2015-09-23 06:18:04 +00:00
Justin Harrison
184440cea3 am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev 
* commit '47cae24077015c5226f5b2d00ebe841ccbaed2d6':
  Extended the maximum pulsing duration when dozing
 2015-09-23 06:07:47 +00:00
Justin Harrison
47cae24077 Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev 2015-09-23 06:00:24 +00:00
Baligh Uddin
effcd9f4ac Import translations. DO NOT MERGE 
Change-Id: I45408b967515cd8e66d922507127a392dacbdf4f
Auto-generated-cl: translation import
 2015-09-22 21:42:46 -07:00
Soonil Nagarkar
cc456c7fda am 7b9bcf02: am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 
* commit '7b9bcf02e1954b48a80a9e43df5b25d875172730':
  Fix reintroduction of b/10845061
 2015-09-23 02:11:55 +00:00
Jorim Jaggi
7e94ae833f am 1bdfd128: am 6da88610: am 302475e9: Fix verifyUnlock 
* commit '1bdfd1284151ba0b4afae11f70ee90208f0a1633':
  Fix verifyUnlock
 2015-09-23 02:11:49 +00:00
Soonil Nagarkar
7b9bcf02e1 am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 
* commit 'fd5cb76ed654998df466147c19ec985115749e70':
  Fix reintroduction of b/10845061
 2015-09-23 02:06:09 +00:00
Jorim Jaggi
1bdfd12841 am 6da88610: am 302475e9: Fix verifyUnlock 
* commit '6da88610cea1e5f815e2d56979f54808c02a652f':
  Fix verifyUnlock
 2015-09-23 02:06:03 +00:00
Soonil Nagarkar
fd5cb76ed6 am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 
* commit '79490dbacd90a851ed8d03d64acedbf3616adba4':
  Fix reintroduction of b/10845061
 2015-09-23 01:58:11 +00:00
Jorim Jaggi
6da88610ce am 302475e9: Fix verifyUnlock 
* commit '302475e93ce00287770aba9668acbe86e8b20a05':
  Fix verifyUnlock
 2015-09-23 01:58:01 +00:00
Soonil Nagarkar
79490dbacd Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 2015-09-23 01:34:53 +00:00
Jorim Jaggi
302475e93c Fix verifyUnlock 
Bug: 23970549
Change-Id: I899d8a92050c257217fa8528c33cb4592ad6d76a
 2015-09-23 00:57:50 +00:00
Daniel Micay
76f6a86de2 constify JNINativeMethod function pointer tables 
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
 2015-09-22 17:10:35 -04:00
Selim Cinek
bb998c927c Extended the maximum pulsing duration when dozing 
Change-Id: Ib0f4cb4c7a011ce6df4100189b79ed4c2476c2c6
 2015-09-22 10:05:29 +02:00
Soonil Nagarkar
d642698a81 Fix reintroduction of b/10845061 
Prevent crash in case where NLP is not available. Also fix an integer
overflow bug that remained uncaught.

BUG: 22345134
Change-Id: If6ff7b12f0d15bb2fe97589f8b0be10f9ed06197
(cherry picked from commit 2ec5c5cced4bd5b9dfbb7578f573c56b3bbc7ddf)
 2015-09-21 17:40:32 +00:00
Baligh Uddin
7bd7a24264 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:45:29 +00:00
Baligh Uddin
462c76f129 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:45:16 +00:00
Baligh Uddin
4cfcdac0fb Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:47 +00:00
Baligh Uddin
5eed30f30c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:44 +00:00
Baligh Uddin
20094d70ac Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:42 +00:00
Baligh Uddin
18b2419d99 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:39 +00:00
Baligh Uddin
14d7a10a80 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:35 +00:00
Baligh Uddin
39dc2f3156 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:31 +00:00
Baligh Uddin
dc6c52779f Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:28 +00:00
Baligh Uddin
5aecb21d8b Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:25 +00:00
Baligh Uddin
396c4a7345 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:23 +00:00
Baligh Uddin
6fad59a41a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:43:21 +00:00
Baligh Uddin
2deb87d4df Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:35:14 +00:00
Baligh Uddin
a9fc533b09 Import translations. DO NOT MERGE 
Change-Id: I08b112bde5280593b52c7aa50b56d41092f94056
Auto-generated-cl: translation import
 2015-09-18 14:17:59 -07:00
Baligh Uddin
550ac93a79 Import translations. DO NOT MERGE 
Change-Id: I81add884ffd46b17bed8f38abb835c79aeb4752f
Auto-generated-cl: translation import
 2015-09-18 14:15:54 -07:00
Baligh Uddin
c05142c052 Import translations. DO NOT MERGE 
Change-Id: Ie83919c03d360d8955701954b4888e0e7ac51aae
Auto-generated-cl: translation import
 2015-09-18 14:06:53 -07:00