Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,555 Commits 3 Branches 0 Tags
0e86dfb8028fd4fce7e61291c8628720acc277d9
Commit Graph

59935 Commits

Author SHA1 Message Date
Makoto Onuki
0e86dfb802 Merge "Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev am: 5b9d876ef5" into nyc-mr1-dev-plus-aosp 
am: ccf9c83765

* commit 'ccf9c8376595ddbed64cedd236349cb99a2e8708':
  ShortcutManaegr: bug fixes

Change-Id: I2aeb67ca5f46165b63e685c90d8acf6cb909b351
 2016-05-04 22:09:57 +00:00
Wale Ogunwale
d622b932fa Merge "Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev am: 75179ada54" into nyc-mr1-dev-plus-aosp 
am: c2bef7c6e2

* commit 'c2bef7c6e2eade011a73db1abd4acf2ab8b3aca7':
  Make sure to pause activity before stopping

Change-Id: I4ae725d3d331cf834da1456d6aebcc702e4ad8d6
 2016-05-04 22:09:41 +00:00
Robin Lee
4632c0c9a8 Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2 am: 78d0888e8c" into nyc-mr1-dev-plus-aosp 
am: 062a28b6a4

* commit '062a28b6a403a48d6f5f88e109a899c9c60581c1':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I9ebd6221451ee10649a1f340031d62c6483832f1
 2016-05-04 22:04:40 +00:00
Abhijith Shastry
00dc230a09 Merge "Merge "Update BlockedNumberContract documentation." into nyc-dev am: 9a2384a7a6 am: c7e32aba8d" into nyc-mr1-dev-plus-aosp 
am: d843f04cd3

* commit 'd843f04cd3b9a3f68cae9c15c6313b8f5099893e':
  Update BlockedNumberContract documentation.

Change-Id: I5e338921fd7f82bbd8e84f31088329cbc17737a8
 2016-05-04 22:01:52 +00:00
Renat Aksitov
c1b6e2db3f Merge "Merge "Voice Messaging Intent API." into nyc-dev am: d516e30b91 am: 032c1a9299" into nyc-mr1-dev-plus-aosp 
am: f473ee9ebc

* commit 'f473ee9ebc992737ef226ae78b46b6e9fef3563f':
  Voice Messaging Intent API.

Change-Id: I8017d7b1f39cc7c21feb98f4a469dd5c5de77cb4
 2016-05-04 21:59:57 +00:00
Vladislav Kaznacheev
9f842251b0 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev am: 221c6e6db7 am: 423c902258 
am: 040646bb08

* commit '040646bb084632713436ee6a2a0b9de99d4eee8d':
  Fix ClipData JavaDoc and behavior that contradicts JavaDoc

Change-Id: Ifa6973f839dd2c8f4bac8befd6ad445f68a462d9
 2016-05-04 21:54:46 +00:00
Makoto Onuki
bdfb3aada3 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev 
am: 5b9d876ef5

* commit '5b9d876ef5bf4613d9ef89148c1ab021c473c02e':
  ShortcutManaegr: bug fixes

Change-Id: I3823ba8a62a853d0ee49ec7626778b8fa09adbab
 2016-05-04 21:42:26 +00:00
Wale Ogunwale
8fa700675d Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev 
am: 75179ada54

* commit '75179ada546393cb8929ca9703d39e1151d95ed9':
  Make sure to pause activity before stopping

Change-Id: I5020b92b2edbe0ff749d019fbeb81abf2ae49fe9
 2016-05-04 21:42:18 +00:00
Robin Lee
d319d26279 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2 
am: 78d0888e8c

* commit '78d0888e8c9358681a6f564b30b2cc35bbe72a45':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7ec39775980ec839aa814cf284ea352789aa788f
 2016-05-04 21:41:23 +00:00
Abhijith Shastry
0734be2f3e Merge "Update BlockedNumberContract documentation." into nyc-dev am: 9a2384a7a6 
am: c7e32aba8d

* commit 'c7e32aba8d9c24040da00d6ec1e599a14c4c4f8d':
  Update BlockedNumberContract documentation.

Change-Id: I136799fbedecbea19a005fe4d47b2e41be98cffb
 2016-05-04 21:40:04 +00:00
Renat Aksitov
09f9bc73f4 Merge "Voice Messaging Intent API." into nyc-dev am: d516e30b91 
am: 032c1a9299

* commit '032c1a92994e251336114c6b600040bf86991772':
  Voice Messaging Intent API.

Change-Id: Iad7c03099fae00d3c1c2bea0f8100608af33851d
 2016-05-04 21:39:47 +00:00
Vladislav Kaznacheev
040646bb08 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev am: 221c6e6db7 
am: 423c902258

* commit '423c9022582b2ae9397a4fb52b0293b313c785cf':
  Fix ClipData JavaDoc and behavior that contradicts JavaDoc

Change-Id: Ib6c6dc2770ff6332fbcb6285e871db971e54b066
 2016-05-04 21:38:17 +00:00
Makoto Onuki
5b9d876ef5 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev 2016-05-04 21:28:17 +00:00
TreeHugger Robot
5f81a3f84c Merge "Make sure to pause activity before stopping" into nyc-dev 2016-05-04 20:28:51 +00:00
Makoto Onuki
8569452603 ShortcutManaegr: bug fixes 
Fixes 28590035
Fixes 28586105

Change-Id: Ia11d29e4996ad5b47b279a3c04d9586695cdc0a5
 2016-05-04 13:00:41 -07:00
Wale Ogunwale
5dc6d6551e Make sure to pause activity before stopping 
In some cases it is possible for activity manager to request
a resumed activity to stop when it's visibility changes. This
is a valid transition, however we need to make sure to pause
the activity on the client side before stopping it so lifecycle
transition works as expected.

Bug: 28574036
Change-Id: I759b38bbd1c9c3bb0475759bcb638d8223fa504d
 2016-05-04 11:46:29 -07:00
Robin Lee
7ec93a1ee2 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 2016-05-04 18:38:30 +00:00
Abhijith Shastry
9a2384a7a6 Merge "Update BlockedNumberContract documentation." into nyc-dev 2016-05-04 18:14:38 +00:00
Renat Aksitov
d516e30b91 Merge "Voice Messaging Intent API." into nyc-dev 2016-05-04 18:02:47 +00:00
TreeHugger Robot
221c6e6db7 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev 2016-05-04 17:07:13 +00:00
Gustav Sennton
17757f8e37 Nicer rethrowing of RemoteExceptions from WebViewUpdateService 
Bug: 28437506
Change-Id: I413334efa3d2ca16ee8fe8822fdbcddfdc250a21
 2016-05-04 14:32:31 +00:00
Tim Volodine
28aec4fdd2 Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev am: 42791eca7d am: 8e11bff55e 
am: 0685396eac

* commit '0685396eacb24c61c5cff98ac908684715a70fbe':
  [WebView] Update ServiceWorker related documentation.

Change-Id: I0909b84a3e42a054ea9e75d4c0abbebf345d9641
 2016-05-04 13:06:38 +00:00
Tim Volodine
8e11bff55e Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 
am: 42791eca7d

* commit '42791eca7dd70a077bca554b708c65794afdde92':
  [WebView] Update ServiceWorker related documentation.

Change-Id: I88a8fdb21afead0c268754ba2b459eb75a2de90f
 2016-05-04 12:52:16 +00:00
TreeHugger Robot
42791eca7d Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 2016-05-04 12:37:21 +00:00
Tony Mak
0cded9d39c New settings key and policy transparency for managed profile settings am: c820cc5fb1 am: aded4dbf5e 
am: 3c399a6855

* commit '3c399a68559f52bbb9c209c8bd6ed5ae3aeff962':
  New settings key and policy transparency for managed profile settings

Change-Id: I943f08261feae6673f48980f7c9ea9c9419c21d7
 2016-05-04 09:58:11 +00:00
Tony Mak
aded4dbf5e New settings key and policy transparency for managed profile settings 
am: c820cc5fb1

* commit 'c820cc5fb1eb036e76d60a25f151cbd91485feb3':
  New settings key and policy transparency for managed profile settings

Change-Id: I5e5d30e39e1ba3c25a589fd6123f3a926b5745ba
 2016-05-04 09:47:33 +00:00
Tony Mak
c820cc5fb1 New settings key and policy transparency for managed profile settings 
Bug: 28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
 2016-05-04 09:33:08 +00:00
Keisuke Kuroyanagi
0a9e750483 Merge "Show drag handles after finishing batch edit if needed." into nyc-dev am: be1cd9f5ce am: 5496ec1875 
am: 8615fdf80c

* commit '8615fdf80c2c09d3d4d956cf8ba9271331c631a5':
  Show drag handles after finishing batch edit if needed.

Change-Id: I6461dfd0a53a23d54cc2e9cbac7ba429f67d4a2f
 2016-05-04 00:44:30 +00:00
Amith Yamasani
f5b388c1ae Merge "Clear active requests on switching voice interactor" into nyc-dev am: ec07352007 am: ae4ecce1ef 
am: 5e603c6fa0

* commit '5e603c6fa0b250f5eb0212fc78840eaa1d80007d':
  Clear active requests on switching voice interactor

Change-Id: Ied72a73f7c8a54ed20af91fa7e36da7ffe7c2ba2
 2016-05-04 00:44:14 +00:00
Keisuke Kuroyanagi
5496ec1875 Merge "Show drag handles after finishing batch edit if needed." into nyc-dev 
am: be1cd9f5ce

* commit 'be1cd9f5ce6eb2bc37b15258c6ab22e2fc5592e1':
  Show drag handles after finishing batch edit if needed.

Change-Id: Ie831efddf37c32c003936d5214d30f7d59878fb8
 2016-05-04 00:30:11 +00:00
Amith Yamasani
ae4ecce1ef Merge "Clear active requests on switching voice interactor" into nyc-dev 
am: ec07352007

* commit 'ec07352007812eeb70c5f47bbac54e9816a30b55':
  Clear active requests on switching voice interactor

Change-Id: Ib9f32bf86c8a3b8da8e796d722ce1843ad775dc4
 2016-05-04 00:30:06 +00:00
Keisuke Kuroyanagi
be1cd9f5ce Merge "Show drag handles after finishing batch edit if needed." into nyc-dev 2016-05-04 00:22:58 +00:00
Abhijith Shastry
1705fc4767 Update BlockedNumberContract documentation. 
For secondary users, a SecurityException is thrown instead of UnsupportedOperationException.

BUG: 28294786
Change-Id: I6402b856eeb02c4c1d940606ae7e69f3ae9cb45d
 2016-05-03 17:18:02 -07:00
TreeHugger Robot
ec07352007 Merge "Clear active requests on switching voice interactor" into nyc-dev 2016-05-04 00:13:30 +00:00
Vladislav Kaznacheev
f67661cc7a Fix ClipData JavaDoc and behavior that contradicts JavaDoc 
1. Expand JavaDoc for ClipData.addItem to clarify how MIME types are affected.
2. Add "text/uri-list" to MIME type list only for non-content URIs (as JavaDoc explicitly says).

Bug: 28564003
Change-Id: I074daf34310323725690a9ba2c7dff0542ed6349
 2016-05-03 16:48:24 -07:00
Amith Yamasani
eeed06c108 Clear active requests on switching voice interactor 
When voice interactor goes null or changes, cancel all existing
active requests and clear them so that they can be re-submitted.

Bug: 28487567
Change-Id: Ibcf024efcc81ff18ef3babfa9a169292207bc816
 2016-05-03 15:07:03 -07:00
Siyamed Sinir
8cd69a4c48 Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev am: c18009e6dd am: 553aae2501 
am: 668504731e

* commit '668504731ee79e4b0248a868fa229546823ae020':
  Revert "Request re-layout after setText if layout width is 0"

Change-Id: I9511aced9abc8d8c250959069bfe8a862eb29689
 2016-05-03 21:37:58 +00:00
Siyamed Sinir
668504731e Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev am: c18009e6dd 
am: 553aae2501

* commit '553aae250108ab86fa01561e3ba5c11a2c86bc9b':
  Revert "Request re-layout after setText if layout width is 0"

Change-Id: Id9458413f555556fd69071cff51a26dc17bae915
 2016-05-03 21:35:02 +00:00
Siyamed Sinir
938055b122 Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev 
am: c18009e6dd

* commit 'c18009e6dd32f04fdad7f1b27a0a6b52ee5c875c':
  Revert "Request re-layout after setText if layout width is 0"

Change-Id: I2c0b8b910f5cd5de82f3b6831b9dd9166a280dc1
 2016-05-03 21:32:28 +00:00
Siyamed Sinir
c18009e6dd Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev 2016-05-03 21:22:18 +00:00
Siyamed Sinir
1f575b890e Revert "Request re-layout after setText if layout width is 0" 
This reverts commit 375366cb2d. 

Bug: 28523980
Change-Id: Ib4dd00eabaf7b5630b18373cc1d7bec61c0e155d
 2016-05-03 20:35:35 +00:00
Abodunrinwa Toki
b970e9bf01 Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev am: f62dd564ed am: a04fe4fc92 
am: 6609b23ae0

* commit '6609b23ae0ce114cd44c4cef1e3c4ebd98bc1623':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I08542776d74a1804e8787458f5f1688fafc34f18
 2016-05-03 20:25:16 +00:00
Abodunrinwa Toki
6609b23ae0 Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev am: f62dd564ed 
am: a04fe4fc92

* commit 'a04fe4fc92b8a60587104f082b590cf787d04b3b':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I37c2543c0c53031a779c3cb93668a4e824eb98b6
 2016-05-03 20:22:27 +00:00
Chris Wren
2639b52d1f Merge "copy auto-group decisions to updates" into nyc-dev am: facdf19313 am: 126d28b51c 
am: 6733edfa51

* commit '6733edfa51f8a6169bb02c060a9a9794522bbc06':
  copy auto-group decisions to updates

Change-Id: I614dbcb08afab4dd417ae6bc34f7d95c3d5d31bf
 2016-05-03 20:20:11 +00:00
Abodunrinwa Toki
98f91884ff Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev 
am: f62dd564ed

* commit 'f62dd564edfa7f9e02e17e7a2e3107dbc7b4abb0':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I8adae611f525a14dadc2fc0e2c15cc961b61d0cf
 2016-05-03 20:20:05 +00:00
Chris Wren
6733edfa51 Merge "copy auto-group decisions to updates" into nyc-dev am: facdf19313 
am: 126d28b51c

* commit '126d28b51c868579ee5eff1d12ddc0962746ca29':
  copy auto-group decisions to updates

Change-Id: Id71b58586780e1076311db2edea57052bacc2a17
 2016-05-03 20:15:37 +00:00
Abodunrinwa Toki
f62dd564ed Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev 2016-05-03 20:13:26 +00:00
Chris Wren
963b1da018 Merge "copy auto-group decisions to updates" into nyc-dev 
am: facdf19313

* commit 'facdf193139ab32582cf642a6648261bd873268a':
  copy auto-group decisions to updates

Change-Id: Iaeb0f80afda4b51633785fe2cad6f870587b4561
 2016-05-03 20:12:49 +00:00
Dimitry Ivanov
d9fd045ed1 Merge "Allow apps to load libraries from under /data" into nyc-dev am: a31657911c am: fde7511918 
am: d66b0b16fa

* commit 'd66b0b16fa89da38a697953308517cf0560ba04b':
  Allow apps to load libraries from under /data

Change-Id: I577ab4f344c5f20e427eb644bfe0c7de224c54e3
 2016-05-03 20:10:11 +00:00
TreeHugger Robot
facdf19313 Merge "copy auto-group decisions to updates" into nyc-dev 2016-05-03 20:08:03 +00:00