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

18906 Commits

Author SHA1 Message Date
Jorim Jaggi
61a5abcf96 am d5b3a35c: am 5f3af144: am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit 'd5b3a35c14130deba54d9e72a10cce16adf7b99b':
  Fix touch-to-wake while dozing
 2015-08-13 03:18:25 +00:00
Jorim Jaggi
559b8c5f4e Merge commit '80581f7a' into master 
Change-Id: Ifd8f9c7a854901e0a48bc8a611cfb002fa37298c
 2015-08-12 20:09:52 -07:00
Jorim Jaggi
d5b3a35c14 am 5f3af144: am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit '5f3af1449aa9a86768f7768c14eaeba927733c91':
  Fix touch-to-wake while dozing
 2015-08-13 01:18:24 +00:00
Jorim Jaggi
80581f7a65 am deb6a3ac: am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev 
* commit 'deb6a3acbdbf81a995cc3c1eb2475b041564d44d':
  Require strong authentication after a timeout
 2015-08-13 01:18:18 +00:00
Jorim Jaggi
5f3af1449a am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit 'd59f5c02810095bba4bc7a47f9169655d4be7521':
  Fix touch-to-wake while dozing
 2015-08-13 01:09:26 +00:00
Jorim Jaggi
deb6a3acbd am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev 
* commit '73d9e1ce0bc8e4478b165fd5f550c99830fbcb57':
  Require strong authentication after a timeout
 2015-08-13 01:09:21 +00:00
Jorim Jaggi
d59f5c0281 am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit 'a78181b6a88d4ce32bb2b1f01e03b9b048dbaf54':
  Fix touch-to-wake while dozing
 2015-08-13 01:02:35 +00:00
Jorim Jaggi
73d9e1ce0b am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev 
* commit '69082a298f50680128ada89a8bef777f0fadf829':
  Require strong authentication after a timeout
 2015-08-13 01:02:31 +00:00
Jorim Jaggi
aabab27028 Fix touch-to-wake while dozing 
Bug: 23113439
Change-Id: I7abcf1b4298fc832ba78df742c691246766993b1
 2015-08-12 16:45:34 -07:00
Jorim Jaggi
25b4d4b280 Require strong authentication after a timeout 
Bug: 21594472
Change-Id: Iab169d4fa2e4ad134f8c8579654b28e96b5b1385
 2015-08-12 16:39:56 -07:00
Jason Monk
88a96f5827 am 9ec018e5: am fc10c986: am 36ea805f: am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev 
* commit '9ec018e54b56b6f62d29ab719371469049a5b3a3':
  Fix tuner for secondary users
 2015-08-12 18:32:51 +00:00
Jason Monk
9ec018e54b am fc10c986: am 36ea805f: am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev 
* commit 'fc10c9863394c67fd419b6f25e2dd8ecef41c4d3':
  Fix tuner for secondary users
 2015-08-12 18:27:44 +00:00
Jason Monk
fc10c98633 am 36ea805f: am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev 
* commit '36ea805f1e55fcf96e341668a200668939b03976':
  Fix tuner for secondary users
 2015-08-12 18:18:27 +00:00
Jason Monk
36ea805f1e am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev 
* commit '670b8b597131c35cbd742d94ee1d22ace5d06e51':
  Fix tuner for secondary users
 2015-08-12 18:09:24 +00:00
Jason Monk
670b8b5971 am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev 
* commit '0c7629579184f85d36a4854e7c6f5b81f5b7299e':
  Fix tuner for secondary users
 2015-08-12 18:06:18 +00:00
Jason Monk
0c76295791 Merge "Fix tuner for secondary users" into mnc-dev 2015-08-12 17:59:22 +00:00
Daichi Hirono
05f40a6a9f Merge "Start to use importFile to file descriptor." 2015-08-12 08:50:25 +00:00
Daichi Hirono
2ff024f497 Start to use importFile to file descriptor. 
BUG=22908937

Change-Id: Ia4f01099816e7841e364d46c125542d006cd47a6
 2015-08-12 17:37:04 +09:00
Julia Reynolds
3322690871 am a6bce6df: am bcca1fdd: am edf02322: am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev 
* commit 'a6bce6df6fb7d904b766d1a754d91321b8a76bba':
  New landscape Navigation bar icons.
 2015-08-12 01:54:23 +00:00
Julia Reynolds
a6bce6df6f am bcca1fdd: am edf02322: am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev 
* commit 'bcca1fdd2469a21264c7697a03074476bd1479d2':
  New landscape Navigation bar icons.
 2015-08-12 01:44:42 +00:00
Julia Reynolds
bcca1fdd24 am edf02322: am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev 
* commit 'edf02322bc35fb619f3149e71ddc66737787f1f4':
  New landscape Navigation bar icons.
 2015-08-12 01:40:18 +00:00
Julia Reynolds
edf02322bc am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev 
* commit 'b46c2a815b2a83b139cf2b4c9ebbb03e9f774d1d':
  New landscape Navigation bar icons.
 2015-08-12 01:32:25 +00:00
Selim Cinek
1ca500cfc2 am 7f07068d: am 8d97651d: am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit '7f07068df990e88e993e44d58d5c5d4acfbc7171':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:28:09 +00:00
Julia Reynolds
b46c2a815b am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev 
* commit '77b0d6e9f001c5e08fa367bff3b3e501ab36cc77':
  New landscape Navigation bar icons.
 2015-08-12 01:25:03 +00:00
Selim Cinek
7f07068df9 am 8d97651d: am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit '8d97651d15821f0fc767a0f33adb6a051c55162c':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:20:06 +00:00
Selim Cinek
8d97651d15 am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit '13c9828fab18571121ec3fecca99f709d606925b':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:12:59 +00:00
Selim Cinek
13c9828fab am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit 'c40d6799df6b3dc1c61aa05d2e356096521b7099':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:06:16 +00:00
Selim Cinek
cfafe4ea6f Indicating fingerprint error messages on the bouncer now 
Also ensure that error messages are surfaced when the screen
comes on such that the user knows why his fingerprint is not
working.

Bug: 22035466
Bug: 22524101
Change-Id: I00b0e833cdb8a3475545ba75b8cb7bf7a419dfd4
 2015-08-11 16:37:54 -07:00
Jorim Jaggi
56c6df333a am 839e85c8: am 61c70aad: am f306cef4: am 959431bc: Wake device when Keyguard invisible and getting fingerprint 
* commit '839e85c89054fb10c01fc6dbc04d2eabb112e0d3':
  Wake device when Keyguard invisible and getting fingerprint
 2015-08-11 23:33:43 +00:00
Jorim Jaggi
839e85c890 am 61c70aad: am f306cef4: am 959431bc: Wake device when Keyguard invisible and getting fingerprint 
* commit '61c70aad9616f9594598b06afc398c7cdebd9d69':
  Wake device when Keyguard invisible and getting fingerprint
 2015-08-11 23:26:34 +00:00
Jorim Jaggi
61c70aad96 am f306cef4: am 959431bc: Wake device when Keyguard invisible and getting fingerprint 
* commit 'f306cef4c215c77049024d28617af29a7b03b96f':
  Wake device when Keyguard invisible and getting fingerprint
 2015-08-11 23:20:41 +00:00
Jorim Jaggi
f306cef4c2 am 959431bc: Wake device when Keyguard invisible and getting fingerprint 
* commit '959431bcca9fc7b3491b1501957b1f4b45efee65':
  Wake device when Keyguard invisible and getting fingerprint
 2015-08-11 22:46:41 +00:00
Jorim Jaggi
959431bcca Wake device when Keyguard invisible and getting fingerprint 
Also fixes a bug where we didn't listen for fingerprint after
rebooting the device.

Bug: 22644634
Bug: 23046263
Change-Id: Ide85a01d9d4cfcc880fbc29ca4f3cc6eef47da2d
 2015-08-11 22:35:50 +00:00
Julia Reynolds
fe114b9902 New landscape Navigation bar icons. 
Bug: 22855920
Change-Id: I5127c8d0121aa90a1e52da1b51a86bac1c1b2fa1
 2015-08-11 15:32:29 -04:00
Jason Monk
540542b417 Fix tuner for secondary users 
Bug: 23112000
Change-Id: I52aabdd1f345fb50e2c5015d233f4de3cc8d994d
 2015-08-11 14:21:52 -04:00
Daniel Sandler
ef00638754 am 5e3e4f9b: am 49ae8f2e: am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit '5e3e4f9b5832c4ddf3a4ad1944622966351e6ffe':
  Crash apps with bad notification icons.
 2015-08-11 14:49:49 +00:00
Daniel Sandler
5e3e4f9b58 am 49ae8f2e: am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit '49ae8f2ef20843514e63aff5378dbdc0644ee0cb':
  Crash apps with bad notification icons.
 2015-08-11 14:44:10 +00:00
Daniel Sandler
49ae8f2ef2 am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit 'd74681763c4ca9047b006efab5098a87e302f479':
  Crash apps with bad notification icons.
 2015-08-11 14:37:56 +00:00
Daniel Sandler
d74681763c am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit '5bba07eb01d923beea173712295d6b10c9762400':
  Crash apps with bad notification icons.
 2015-08-11 14:29:39 +00:00
Daniel Sandler
5bba07eb01 am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit 'ad7719dea4e8fd34854e4dcc918fc593c4416d82':
  Crash apps with bad notification icons.
 2015-08-11 14:22:12 +00:00
Daniel Sandler
ad7719dea4 Merge "Crash apps with bad notification icons." into mnc-dev 2015-08-11 14:17:45 +00:00
Daichi Hirono
6eed9a23df Merge "Implement MtpDocumentsProvider#queryChildDocuemnts." 2015-08-11 09:10:57 +00:00
Daichi Hirono
124d060bc9 Implement MtpDocumentsProvider#queryChildDocuemnts. 
BUG=20274999

Change-Id: Ib18e0f36aa97add1c4b603fe11e9adedfef157ec
 2015-08-11 18:08:07 +09:00
Winson Chung
f304c729ee am 641363e8: am bfa04f49: am b12ca163: am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit '641363e8941f490cda95f9b2f764d51937cd2694':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 03:08:31 +00:00
Winson Chung
641363e894 am bfa04f49: am b12ca163: am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'bfa04f4998956e510a935f6514298dcd3d122264':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 03:00:44 +00:00
Winson Chung
bfa04f4998 am b12ca163: am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'b12ca1635a81c5ab6b1d4dfa5cdf8e01612f8ca3':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 02:53:53 +00:00
Winson Chung
b12ca1635a am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'bc58c9453fd4f647a3382608f8de8e557854758d':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 02:47:48 +00:00
Winson Chung
bc58c9453f am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'c00b1067a05116548a0883e1400a1c4715078797':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 02:40:05 +00:00
Winson Chung
c00b1067a0 Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 2015-08-11 02:33:15 +00:00
Jorim Jaggi
2d925a31f4 am 858a929f: am 231bddea: am 1785c097: am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev 
* commit '858a929f6e5f9b2e734307dce95da8da982f4be1':
  Don't show fingerprint cancellation messages in keyguard
 2015-08-11 02:05:32 +00:00