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
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
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
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
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
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
Jeff Sharkey
c97509c029
Merge "Update ifaces when global restriction changes." into mnc-dev
2015-08-12 23:51:55 +00:00
Jeff Sharkey
9d14206594
Update ifaces when global restriction changes.
...
Global restriction of background data only applies to metered
interfaces, but battery saver applies to all interfaces. In the
very specific case where global background had been turned on while
battery saver was enabled, we'd end up with a stale battery saver
rule floating around.
This change triggers an update of iface rules when the global
restriction changes, giving us consistent behavior.
Bug: 23098198
Change-Id: I454dc71cf11d50a2e9e6122e8a801ff17039b43a
2015-08-12 16:46:05 -07: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
Roshan Pius
b40108fb85
am 289ecbbf: am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
...
* commit '289ecbbfafbb73ccf00e14ea8e2f6584406b50fe':
Add a new carrier config for DTMF tone gap.
2015-08-12 23:25:22 +00:00
Roshan Pius
289ecbbfaf
am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
...
* commit '737aed41ca9d8bad425ed8223fa4e4c84c7b102c':
Add a new carrier config for DTMF tone gap.
2015-08-12 23:17:27 +00:00
Roshan Pius
737aed41ca
Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
2015-08-12 23:12:24 +00:00
Dianne Hackborn
c3f7449517
Fix issue #23116383 : Include security patch level in Settings
...
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
2015-08-12 16:10:58 -07:00
Mike Dodd
4ec593928e
Set default SMS/MMS app to com.android.messaging (new AOSP app).
...
b/23110861
Change-Id: Ifcdcfdea4d19875bf32ec19d245abc5e5a582b4c
2015-08-12 15:44:05 -07:00
Raph Levien
cf2d44bee5
am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
...
* commit '855a862f6d1ef1af1b16c21d67645b5141db94fc':
Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:22:46 +00:00
Raph Levien
855a862f6d
am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
...
* commit 'c98a786c693bf0bb617348e858ffe720db4d96d8':
Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:13:32 +00:00
Raph Levien
c98a786c69
am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
...
* commit 'beabcb92cbdec6f68bd712c9972e6f8377b78f46':
Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:07:43 +00:00
Roshan Pius
9f81ce727c
Add a new carrier config for DTMF tone gap.
...
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network.
BUG: 23064351
Change-Id: I3a0e20efecd62f533e796a40097f181d4c20d614
2015-08-12 21:04:26 +00:00
Raph Levien
beabcb92cb
Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
2015-08-12 21:00:07 +00:00
Eino-Ville Talvala
f21ecd037e
am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
...
* commit '6986410a598fd214cdcbd684c236d071a198c075':
Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 20:41:55 +00:00
Eino-Ville Talvala
6986410a59
am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
...
* commit '5679800f382918bb3ca159997609fc551f2a739a':
Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 20:32:53 +00:00
Eino-Ville Talvala
5679800f38
am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
...
* commit '242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 20:18:46 +00:00
Jason Monk
bba7317d07
Add more intelligence to bluetooth connection state
...
Since bluetooth connection state has a mind of its own... If we
think we are connected, but we don't actually know about any devices
that are currently connected, we probably aren't. So set the state
that way, and let everyone know.
Bug: 22977827
Change-Id: I9266f5394b179a3917b3818839f7c6b2dc238376
2015-08-12 16:17:34 -04:00
Clara Bayarri
f95ed10d9d
Fix Insertion ActionMode not showing on RTL languages
...
When long pressing on an empty Text field with the system language set
to RTL, the "paste" popup was not showing up.
The Floating Toolbar requires a content rect to determine where the
text is and place itself close to it. In the case of an empty field,
we create a "fake" content rect by taking the placement of the cursor
+1 pixel to the right. In RTL languages, this +1 causes the content
rect to be considered off the bounds of the view, as the cursor is
aligned to the right, and hence the Floating Toolbar is hidden.
After making the rect a 0 width rect, we ran into the issue that
it was considered out of bounds due to the calculation ignoring rects
that simply touch the edge of the view's bounds.
BUG: 22540083
Change-Id: I29c79b701f586970b2611178233eff082b802ec1
2015-08-12 21:03:28 +01:00
Eino-Ville Talvala
242ff8a89d
Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
2015-08-12 20:01:44 +00:00
Mike Dodd
4a6b0c93f8
am 79fdfecb: am 954ca10e: am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
...
* commit '79fdfecb94f36844d5cc878a2e4199ec5010837a':
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
2015-08-12 19:14:24 +00:00
Mike Dodd
79fdfecb94
am 954ca10e: am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
...
* commit '954ca10eeee254c923a53e0632d1ec84c10aee8b':
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
2015-08-12 19:06:13 +00:00
Mike Dodd
954ca10eee
am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
...
* commit 'ad285c169fd55bee8feef6e076a6710c357043e5':
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
2015-08-12 18:59:05 +00:00
Mike Dodd
ad285c169f
Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
2015-08-12 18:53:48 +00:00