Brian Attwell
a29ce2d47d
Merge "Expose ContentProviderOperation type"
2015-01-22 20:53:53 +00:00
Brian Attwell
9986f8e85a
Expose ContentProviderOperation type
...
CHANGE
isInsert, isDelete, isUpdate, isAssertQuery
JUSTIFICATION
The use of getType() in lots of unit tests means that
ContentProviderOperation#getType() can't practically be
removed.
Why not make it public? This allows 3p to use getType() in
unit tests. Plus it allows the unbundled contacts app
to continue using getType() in order to handle TYPE_INSERT
specially, without needing to awkwardly pass isInsert values
around.
Bug: 18777272
Change-Id: I3265193cda0c9405f6df896cd96a10df7225445a
2015-01-22 12:53:29 -08:00
Jeff Sharkey
2e5716417e
Public API for StrictMode cleartext detection.
...
Bug: 18335678
Change-Id: I4c3fd72303ae86f0c85f99ce9bdfd2913296a256
2015-01-22 11:53:43 -07:00
Ignacio Solla
3fed946aee
Merge "[WebView] Improve documentation around full screen mode."
2015-01-22 10:55:19 +00:00
Nicolas Prevot
8b5daa6be2
am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
...
automerge: 2cb240e
2015-01-22 10:37:56 +00:00
Ignacio Solla
7a4e18f8b8
[WebView] Improve documentation around full screen mode.
...
onShowCustomView and onHideCustomView are only used for full screen
support so we make that more explicit now (perhaps we should consider
rename and deprecate).
In M40 the WebView will also support full screen for non <video>
elements so we also consider that use case.
Change-Id: Ie4e245defbdd3e53bff98ac73305dd5e5e46334c
2015-01-22 10:35:07 +00:00
Nicolas Prevot
2cb240e083
am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
...
* commit '3677117d2bc8b703ccad4eff5914a61508922dd6':
Never set "Work" or "Personal apps" as prefered activities.
2015-01-22 10:32:30 +00:00
Nicolas Prevot
3677117d2b
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
...
automerge: ad44f74
2015-01-22 10:24:49 +00:00
Nicolas Prevot
ad44f7448f
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
2015-01-22 10:22:08 +00:00
Jim Miller
8abb6d5e9f
am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49
...
automerge: 54dbd1f
2015-01-22 02:50:25 +00:00
Jim Miller
54dbd1fd43
am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49
...
* commit '0ac8dfa37bf089ade3760a8d703c6a79d98f5ca2':
Clarify getTrustAgentConfiguration() documentation.
2015-01-22 02:45:16 +00:00
Jim Miller
0ac8dfa37b
Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev
...
automerge: ffd1a49
2015-01-22 02:40:15 +00:00
Jim Miller
ffd1a49c0b
Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev
2015-01-22 02:37:39 +00:00
Robert Greenwalt
bea29888c8
am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev automerge: 0343e1a
...
automerge: 8379688
2015-01-22 00:09:28 +00:00
Robert Greenwalt
8379688475
am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
...
automerge: 0343e1a
2015-01-21 23:59:09 +00:00
Alan Viverette
5e0908ac03
Merge "Ensure scroll drawables are managed correctly"
2015-01-21 23:57:51 +00:00
Robert Greenwalt
0343e1a704
am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
...
* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
Rerun entitlementcheck on sim change.
2015-01-21 23:56:02 +00:00
Robert Greenwalt
7ca16ff8c6
Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
2015-01-21 23:49:12 +00:00
Dianne Hackborn
4da9bbbbd9
Merge "Bring back voice interaction APIs."
2015-01-21 23:45:55 +00:00
Alan Viverette
029d039ea5
Ensure scroll drawables are managed correctly
...
Bug: 19035677
Change-Id: Ib86666ddd1b6747f921a6e2f048405aba0c04ef7
2015-01-21 15:41:53 -08:00
Dianne Hackborn
4e106cedfe
Bring back voice interaction APIs.
...
Change-Id: I6039d7c0b188ac342441c56f7d19994b9a80ba17
2015-01-21 15:07:20 -08:00
Craig Mautner
7b15552692
Merge "Refactor removeApp and removeTask for last removals."
2015-01-21 22:19:25 +00:00
Craig Mautner
e3119b7d35
Refactor removeApp and removeTask for last removals.
...
Move app token removal to the AppWindowToken class so cleanup can
be done locally. Move task removal to the Task class so cleanup can
be done locally. Call task removal when the last app is removed.
Merge actions done prior to method calls into methods.
Fixes bug 18088522 item #12 .
Change-Id: I5ce85d2bb309ceb82bd7404e27a56a7c31cd7359
2015-01-21 13:57:24 -08:00
Jim Miller
b5db57a27d
Clarify getTrustAgentConfiguration() documentation.
...
Fixes bug 18983802
Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
2015-01-21 21:01:02 +00:00
Mike Lockwood
767cddd3dd
Merge "Watch for NumberFormatExceptions in AlsaCardsParser and AlsaDevicesParser"
2015-01-21 20:09:51 +00:00
Mike Lockwood
a1329aebe7
Watch for NumberFormatExceptions in AlsaCardsParser and AlsaDevicesParser
...
Bug: 19082426
Change-Id: I130d4df290716339326a28d249217a8a04220176
2015-01-21 11:11:14 -08:00
Dianne Hackborn
4b94649ce3
Merge "Work on issue #18201239 : ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 automerge: 5346a21
...
automerge: f6b4b1a#18201239 : ANRs in com.google.process.gapps:
2015-01-21 19:00:55 +00:00
Dianne Hackborn
f6b4b1a432
Merge "Work on issue #18201239 : ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695
...
automerge: 5346a21#18201239 : ANRs in com.google.process.gapps:
2015-01-21 18:55:12 +00:00
Dianne Hackborn
5346a21bad
Merge "Work on issue #18201239 : ANRs in com.google.process.gapps:" into lmp-mr1-dev
...
automerge: 2132695#18201239 : ANRs in com.google.process.gapps:
2015-01-21 18:47:11 +00:00
Svetoslav
220dbc4a7f
AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd automerge: 03944ce
...
automerge: 2b2b1a9
2015-01-21 18:43:41 +00:00
Dianne Hackborn
213269599b
Merge "Work on issue #18201239 : ANRs in com.google.process.gapps:" into lmp-mr1-dev
2015-01-21 18:41:38 +00:00
Svetoslav
2b2b1a9b89
AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd
...
automerge: 03944ce
2015-01-21 18:39:34 +00:00
Svetoslav
03944ce664
AlertActivity now behaves as a dialog for accessibility purposes.
...
automerge: 76ff4dd
2015-01-21 18:31:46 +00:00
Svetoslav
76ff4dd0de
AlertActivity now behaves as a dialog for accessibility purposes.
...
AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.
bug:18865632
Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
2015-01-21 18:28:03 +00:00
Dianne Hackborn
455625e298
Work on issue #18201239 : ANRs in com.google.process.gapps:
...
Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService
Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.
Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
2015-01-21 09:55:13 -08:00
Nicolas Prevot
daf92066db
Never set "Work" or "Personal apps" as prefered activities.
...
In ResolverActivity: when the user chooses work or personal:
Do not set them as prefered activities.
BUG:19091836
Change-Id: Ibe0081eb16e58cc25decb3f25b7fd50b5403d5fc
2015-01-21 17:53:11 +00:00
Kenny Guy
2e0072d730
Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca automerge: 11c4cc1
...
automerge: 3458e18
2015-01-21 16:30:22 +00:00
Kenny Guy
3458e180cf
Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca
...
automerge: 11c4cc1
2015-01-21 16:24:01 +00:00
Kenny Guy
11c4cc196d
Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev
...
automerge: 06ab0ca
2015-01-21 16:17:03 +00:00
Kenny Guy
06ab0ca481
Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev
2015-01-21 16:13:24 +00:00
Narayan Kamath
e383132ac5
Merge "Choose the right executable for wrapped applications." automerge: aa87e89 automerge: 4af0265
...
automerge: ebc57c7
2015-01-21 14:13:27 +00:00
Narayan Kamath
ebc57c7471
Merge "Choose the right executable for wrapped applications." automerge: aa87e89
...
automerge: 4af0265
* commit '4af0265a35bcd8a0a7513dd85fe371597e2038c5':
Choose the right executable for wrapped applications.
2015-01-21 14:09:33 +00:00
Narayan Kamath
aa87e89e81
Merge "Choose the right executable for wrapped applications."
2015-01-21 14:01:57 +00:00
Johnson Hsieh
24c33d32cc
Merge "Expose CommandRequest completion status."
2015-01-21 01:39:19 +00:00
Johnson Hsieh
dd32946def
Expose CommandRequest completion status.
...
Expose CommandRequest completion status in client api onCommandResult().
Change-Id: Ib2066b7ca6d7b1ae968da7e7686e34107dc7dfa8
2015-01-20 17:11:50 -08:00
Jinsuk Kim
0ae35a8a26
am 00959a56: am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev automerge: 375ae7b
...
* commit '00959a56e5869fcb8d05399656fddc9da54e86dc':
Mark TimeUnit as @SystemApi
2015-01-20 23:54:47 +00:00
Jinsuk Kim
00959a56e5
am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
...
automerge: 375ae7b
2015-01-20 23:47:44 +00:00
Jinsuk Kim
375ae7ba32
am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
...
* commit '054f2656a17a438aa6e8c8f6dcd61b1217f41b88':
Mark TimeUnit as @SystemApi
2015-01-20 22:43:34 +00:00
Jinsuk Kim
054f2656a1
Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
2015-01-20 22:39:53 +00:00
Jinsuk Kim
28d2a693ef
Mark TimeUnit as @SystemApi
...
Bug: 18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
2015-01-21 07:33:40 +09:00
