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

207232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
f755772957 Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev 2015-08-13 18:49:40 +00:00
Joe Fernandez
9b8bc3dcba am db5b38b2: am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev 
* commit 'db5b38b23c629b18b9a92956c68f82dbaa4e22ef':
  docs: Update developer docs make file to include API 23
 2015-08-13 18:48:12 +00:00
Joe Fernandez
901f807143 docs: Update uses-sdk-element page with API 23 (M) listing 
Change-Id: If579411c66f3cfc02b270a04b266fe7562b48e14
 2015-08-13 11:45:23 -07:00
Joe Fernandez
db5b38b23c am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev 
* commit '195b1fd2b1fbbd25bb18e263489f58a7b14a0139':
  docs: Update developer docs make file to include API 23
 2015-08-13 18:42:51 +00:00
Joe Fernandez
195b1fd2b1 am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev 
* commit '8d149d7ff278c877bf7ccff7cc428cf7ba1db1e4':
  docs: Update developer docs make file to include API 23
 2015-08-13 18:33:47 +00:00
Joe Fernandez
8d149d7ff2 Merge "docs: Update developer docs make file to include API 23" into mnc-dev 2015-08-13 18:27:11 +00:00
Dirk Dougherty
2906bd5cb3 Doc change: Update preview pages for dp3. 
Change-Id: If4a3beab28cc2114cf01a2d6202dc072768960fc
 2015-08-13 10:54:50 -07:00
Mike Dodd
8f517093f2 am 80ca7d27: am 28918812: am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit '80ca7d2794138c047dd54317a73e8ee292e1aa02':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-13 15:43:45 +00:00
Mike Dodd
80ca7d2794 am 28918812: am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit '28918812028f69a6e2c81f56b31724edd35307ce':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-13 15:36:22 +00:00
Mike Dodd
2891881202 am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit '045ffe31056b340fb962c4fef3ed3dbf00b5d251':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-13 15:30:12 +00:00
Mike Dodd
045ffe3105 am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit '226ae04df4b3570d11b66d52a404b2c8b2ac50db':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-13 15:22:48 +00:00
Mike Dodd
226ae04df4 Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 2015-08-13 15:16:39 +00:00
Jason Monk
3e46cc6ed7 am a7e07fde: am 1f567039: am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev 
* commit 'a7e07fded12f7bd4198fd80f6e22ea1deabda43c':
  Add more intelligence to bluetooth connection state
 2015-08-13 15:07:36 +00:00
Jason Monk
a7e07fded1 am 1f567039: am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev 
* commit '1f567039e042314d378b4fb50279e81d773e8733':
  Add more intelligence to bluetooth connection state
 2015-08-13 14:59:15 +00:00
Jason Monk
1f567039e0 am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev 
* commit '60823dc1f90198ab2ec0e8b62cb03900251fcf77':
  Add more intelligence to bluetooth connection state
 2015-08-13 14:52:30 +00:00
Jason Monk
60823dc1f9 am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev 
* commit '90460c79d1af214e73428eac92b5761e743dec4d':
  Add more intelligence to bluetooth connection state
 2015-08-13 14:44:55 +00:00
Jason Monk
90460c79d1 Merge "Add more intelligence to bluetooth connection state" into mnc-dev 2015-08-13 14:38:46 +00:00
Julia Reynolds
ea6c448959 Clear calling identity before getting the current user. 
This is necessary so non-privilged apps can call setInterruptionFilter.

Bug: 23156657
Change-Id: Ia903a39626c93957276d66805446cd25a91341b5
 2015-08-13 09:01:33 -04: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
Svet Ganov
52153f4c05 Add GTS test to ensure valid default permission grants - framework 
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.

bug:23043018

Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
 2015-08-12 21:57:59 -07:00
Joe Fernandez
1827e3230d docs: Update developer docs make file to include API 23 
Change-Id: I1bb9c37cafdfc7c78c23099a0fde2914f3068485
 2015-08-12 19:45:22 -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
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
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
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
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
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