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

211446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daichi Hirono
8b9024f0c2 Add RootScanner to MtpDocumentsProvider to handle new/removed MTP storages. 
BUG=23169303
Change-Id: I5a73da7f869fed2fcf69e6ab7b039d1a60b883e2
 2015-08-14 17:14:52 +09:00
Bart Sears
80e33f12e3 am 54bc30df: am a35ada48: am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev 
* commit '54bc30df5a0211a026e5f804b3ea26dd6a626723':
  Fix Keyguard drawn timeout
 2015-08-13 06:55:15 +00:00
Daichi Hirono
630be43c1c Merge "Let MTPDocumentsProvider load documents in background thread." 2015-08-13 06:50:12 +00:00
Daichi Hirono
6baa16e910 Let MTPDocumentsProvider load documents in background thread. 
The CL introduce DocumentLoader class that has a responsibility for loading
documents on background thread. When the provider is requested documents and the
result is not cached, it returns the cursor containing the first 10 items with
extra loading flag. Then it loads the rest of documents into cache on background
thread and notifies update regularly.

BUG=23067619

Change-Id: I7ac9d919bc3ffee1960ae3e8e7272a792a982ea8
 2015-08-13 15:47:19 +09:00
Bart Sears
54bc30df5a am a35ada48: am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev 
* commit 'a35ada4846d3794408825c10ee8a6070a1590044':
  Fix Keyguard drawn timeout
 2015-08-13 06:43:24 +00:00
Bart Sears
a35ada4846 am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev 
* commit '3ab3ffc646f311f03f464e175f0d4f73c79c0d68':
  Fix Keyguard drawn timeout
 2015-08-13 05:51:48 +00:00
Bart Sears
3ab3ffc646 am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev 
* commit 'b7ae19905a471b0e0c74cd76b9895cad93856deb':
  Fix Keyguard drawn timeout
 2015-08-13 05:46:16 +00:00
Bart Sears
b7ae19905a am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev 
* commit 'bd29b07eab3956796a7a09d7612e42e22616f458':
  Fix Keyguard drawn timeout
 2015-08-13 05:39:02 +00:00
Bart Sears
bd29b07eab Merge "Fix Keyguard drawn timeout" into mnc-dev 2015-08-13 05:32:14 +00:00
Roozbeh Pournader
692adf6ae6 Merge "Fix unintentional NPE in SpannableStringBuilder." 2015-08-13 04:41:48 +00:00
Jorim Jaggi
0ca8da52f7 am 6fe7883f: am 4846c62a: am 24cf8349: am ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev 
* commit '6fe7883f0b164352fb9976d8597e7d0e7b0fe152':
  Do not vibrate if we don't have a fingerprint client
 2015-08-13 03:18:53 +00:00
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
7b867f6173 Merge "Merge commit '80581f7a' into master" 2015-08-13 03:15:45 +00:00
Roozbeh Pournader
cd217b8ace Fix unintentional NPE in SpannableStringBuilder. 
Previously, when getSpans() was called with a null parameter, an
unintentional NullPointerException would be thrown.

Now, we explicitly return an empty array of Objects.

Bug: 19805521
Change-Id: I52f3ae08c2bcf62f6a4d0c01f0fe08ad1134abb8
 2015-08-12 20:14:43 -07:00
Jorim Jaggi
559b8c5f4e Merge commit '80581f7a' into master 
Change-Id: Ifd8f9c7a854901e0a48bc8a611cfb002fa37298c
 2015-08-12 20:09:52 -07:00
Roozbeh Pournader
5e9ed365ad Support strikethrough text in Html.fromHtml(). 
All the three tags, <del>, <s>, and <strike> are now converted to
strikethrough text.

Bug: 21025743
Change-Id: I62dc9793223e266f6e2181169766fde8be0e2aa7
 2015-08-12 19:34:47 -07:00
Jorim Jaggi
6fe7883f0b am 4846c62a: am 24cf8349: am ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev 
* commit '4846c62aa31dd7f60608199b2b63b7bf8bf0a0c0':
  Do not vibrate if we don't have a fingerprint client
 2015-08-13 02:20:03 +00:00
Jorim Jaggi
4846c62aa3 am 24cf8349: am ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev 
* commit '24cf83494844f1ce3c247660af61307366330c80':
  Do not vibrate if we don't have a fingerprint client
 2015-08-13 02:10:42 +00:00
Dianne Hackborn
d38e7c9387 am 1dd2f5a3: am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '1dd2f5a3ebd4768ebc8bf4c08c7f62c8c1300c7f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 02:10:15 +00:00
Jorim Jaggi
24cf834948 am ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev 
* commit 'ac9fbe9d5c235544f058ea9e240085e6a329f6ea':
  Do not vibrate if we don't have a fingerprint client
 2015-08-13 02:04:52 +00:00
Jorim Jaggi
ac9fbe9d5c Merge "Do not vibrate if we don't have a fingerprint client" into mnc-dr-dev 2015-08-13 01:58:55 +00: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
Dianne Hackborn
1dd2f5a3eb am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '40bc20660d3dc65f66e4409893f1ba6bf729d97f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:18:13 +00:00
Andreas Gampe
56e6377618 am ea30eb29: Hwui: Remove unused variables 
* commit 'ea30eb29f87618de673e8b069b1a545749edf076':
  Hwui: Remove unused variables
 2015-08-13 01:11:09 +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
Dianne Hackborn
40bc20660d am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'a54d4583ec4d6b112a99c29ef71fbabfd67478cb':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:09:15 +00:00
Jorim Jaggi
055eafd6ce Do not vibrate if we don't have a fingerprint client 
Bug: 22851337
Change-Id: Ia7be6eda2db08b4df07a48ffa4d24637f59167e9
 2015-08-12 18:06:22 -07:00
Andreas Gampe
ea30eb29f8 Hwui: Remove unused variables 
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512

(cherry picked from commit cb4af9b10ab17187288d8f5ccb4cc1e465be9a51)

Change-Id: Ic58bedc84234325512193991fc64315e3aad6f9e
 2015-08-12 18:05:35 -07: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
Dianne Hackborn
a54d4583ec am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '9512a857454d761b53f46958733ba23216c41e64':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:02:26 +00:00
Jorim Jaggi
a78181b6a8 Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 2015-08-13 00:56:14 +00:00
Jorim Jaggi
69082a298f Merge "Require strong authentication after a timeout" into mnc-dr-dev 2015-08-13 00:56:04 +00:00
Dianne Hackborn
9512a85745 am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 00:54:35 +00:00
Dianne Hackborn
ff9912d594 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:59 +00:00
Nick Kralevich
f6f98daf54 am ebdc7caa: am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit 'ebdc7caac07f35802e1d3635fe55c98983774d49':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-13 00:46:29 +00:00
Nick Kralevich
ebdc7caac0 am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit 'f3ae260367235e325adce10c9aadddfe8a3107c1':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-13 00:40:25 +00:00
Jeff Sharkey
7619dba79e am 59a18530: am b4ac3781: am d913d78a: am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit '59a18530f5fc0152b7a7609bd2ed2128fa8e7fc7':
  Update ifaces when global restriction changes.
 2015-08-13 00:33:35 +00:00
Jeff Sharkey
59a18530f5 am b4ac3781: am d913d78a: am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'b4ac37818efa6ea81902f8b2631260b5b1b0ce78':
  Update ifaces when global restriction changes.
 2015-08-13 00:27:23 +00:00
Deepanshu Gupta
8d38e7c905 Merge "Add StyleableRes annotation to TypedArray." 2015-08-13 00:25:54 +00:00
Jeff Sharkey
b4ac37818e am d913d78a: am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'd913d78a331de5e488b27810d8dd18399f50de48':
  Update ifaces when global restriction changes.
 2015-08-13 00:19:46 +00:00
Jeff Sharkey
d913d78a33 am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'ea68c4ceacbe235c4d8688437010d855ef02e1fb':
  Update ifaces when global restriction changes.
 2015-08-13 00:11:49 +00:00
Jeff Sharkey
ea68c4ceac am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'c97509c0292910d7fb27e4c890ad4bc0ea723fec':
  Update ifaces when global restriction changes.
 2015-08-13 00:00:13 +00:00
Nick Kralevich
f3ae260367 am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit '10e0f07975e6e446763b733bb438df5715c3693d':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-12 23:57:58 +00:00
Roshan Pius
474ee117e8 am c01093cc: am b40108fb: am 289ecbbf: am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 
* commit 'c01093cc9b414f90b2f400cd196d631b38bd6d0f':
  Add a new carrier config for DTMF tone gap.
 2015-08-12 23:56:29 +00:00
Elliott Hughes
4c807349bd am 344d347a: am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '344d347af22705aa2fa80602d27a5682a72b5f69':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 23:56:18 +00:00
Jeff Sharkey
c97509c029 Merge "Update ifaces when global restriction changes." into mnc-dev 2015-08-12 23:51:55 +00:00
Nick Kralevich
10e0f07975 Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 2015-08-12 23:46:28 +00:00