OSDN Git Service
Andy Hung [Sat, 19 Dec 2015 01:33:27 +0000 (17:33 -0800)]
Add setMasterMono and getMasterMono
Bug:
15283594
Bug:
22700363
Change-Id: I5d0552938ec2a54be4450512974d92ff8c77b1e9
Wale Ogunwale [Mon, 4 Jan 2016 22:22:16 +0000 (22:22 +0000)]
Merge "Don't allow unfocusable activity/stack to gain focus"
Chris Wren [Mon, 4 Jan 2016 21:33:46 +0000 (21:33 +0000)]
Merge "fix ActivityMetricsLogger counter names"
Andre Eisenbach [Tue, 29 Dec 2015 22:58:53 +0000 (14:58 -0800)]
Protect android.bluetooth.intent.DISCOVERABLE_TIMEOUT
Bug:
26347910
Change-Id: I61b211c3f32c9e79c40c2b07798dd9cb6d82df22
Jeff Sharkey [Mon, 4 Jan 2016 21:20:49 +0000 (21:20 +0000)]
Merge "More work towards triaging missing app behavior."
Chris Wren [Mon, 4 Jan 2016 21:20:17 +0000 (16:20 -0500)]
fix ActivityMetricsLogger counter names
Change-Id: I49e4785fdecfdbb60fc168539e654bcb7847d1dd
George Mount [Mon, 4 Jan 2016 21:14:38 +0000 (21:14 +0000)]
Merge "Tests for DatePicker keyboard interaction."
Chris Wren [Mon, 4 Jan 2016 21:07:24 +0000 (21:07 +0000)]
Merge "implement assistant service connection"
Fyodor Kupolov [Mon, 4 Jan 2016 20:59:12 +0000 (20:59 +0000)]
Merge "Return USER_OP_SUCCESS when force stopping a user"
Julia Reynolds [Mon, 4 Jan 2016 20:56:59 +0000 (20:56 +0000)]
Merge "Add 'more settings' and 'done' to guts."
Chad Brubaker [Mon, 4 Jan 2016 20:54:00 +0000 (20:54 +0000)]
Merge "Add ConfigNetworkSecurityPolicy" am:
2786002bd5
am:
a35d617cce
* commit '
a35d617cce6c9b1b1cba7e7c786849d21ea42d3e':
Add ConfigNetworkSecurityPolicy
Chad Brubaker [Mon, 4 Jan 2016 20:49:29 +0000 (20:49 +0000)]
Merge "Add ConfigNetworkSecurityPolicy"
am:
2786002bd5
* commit '
2786002bd51b229d9a4672e3c43f835796de06ea':
Add ConfigNetworkSecurityPolicy
Fyodor Kupolov [Mon, 4 Jan 2016 20:47:22 +0000 (12:47 -0800)]
Return USER_OP_SUCCESS when force stopping a user
Bug:
26379502
Change-Id: I08dc18eec5b8dccf63a806acc9b3bfda890ceedb
Wale Ogunwale [Fri, 25 Dec 2015 14:30:31 +0000 (06:30 -0800)]
Don't allow unfocusable activity/stack to gain focus
Prevents them from being resumed since we always want to resumed
activity to be a focusable acitvity.
Bug:
26273032
Change-Id: Ied832e100d9a2d8915762db53c9230774be21d1c
Wale Ogunwale [Mon, 4 Jan 2016 20:35:53 +0000 (20:35 +0000)]
Merge "Consolidate resume activity code around focused stack."
Philip P. Moltmann [Mon, 4 Jan 2016 20:28:27 +0000 (20:28 +0000)]
Merge "Show indeterminate progress bar when job is queued or started and the progress is not known."
Chad Brubaker [Mon, 4 Jan 2016 20:26:56 +0000 (20:26 +0000)]
Merge "Add ConfigNetworkSecurityPolicy"
Julia Reynolds [Mon, 4 Jan 2016 20:24:01 +0000 (15:24 -0500)]
Add 'more settings' and 'done' to guts.
Change-Id: I0499869b1a40653ff1b179a95c55a22d8e12e718
Jeff Sharkey [Mon, 21 Dec 2015 21:16:43 +0000 (14:16 -0700)]
More work towards triaging missing app behavior.
Many places across the platform query package details without
gracefully handling packages or components that go missing for
various reasons. This can cause annoying user data loss, such as
resetting back to built-in apps or dropping of accounts, etc.
This change verifies that system callers have thought about these
edge cases by logging if they use default matching behaviors without
explicitly marking themselves as being "triaged." (The logging is
currently disabled by default.)
Also creates explicit definitions of supported flags for various
incoming PackageManager calls, and defines a clear distinction
between flag types:
-- GET-style flags are used to request additional data that may have
been elided to save wire space.
-- MATCH-style flags are used to include components or packages that
would have otherwise been omitted from a result set by current system
state.
There are a handful of existing GET flags that better fit under the
MATCH definition, so this change clones them to new constants and
marks the old ones as deprecated.
Fixes bug in JobSchedulerService to consider jobs from apps on
external storage. Revert some dialer behavior back to being
untriaged.
Change-Id: I9b6ab0968241e3479bddbd78de0c51e3b9917318
Dan Sandler [Mon, 4 Jan 2016 20:12:24 +0000 (20:12 +0000)]
Merge "Use GregorianCalendar.add() when searching for next alarm." am:
b52de8248f
am:
65a35016c1
* commit '
65a35016c1f22805c2e70b49ff2b121b9f7dc739':
Use GregorianCalendar.add() when searching for next alarm.
Jack Yu [Mon, 4 Jan 2016 20:10:01 +0000 (20:10 +0000)]
Fixed the incorrect cdma RAT detection logic.
am:
fa530b4a10
* commit '
fa530b4a10e8553afd58b827dfd7dcd8726126b4':
Fixed the incorrect cdma RAT detection logic.
Dan Sandler [Mon, 4 Jan 2016 20:07:38 +0000 (20:07 +0000)]
Merge "Use GregorianCalendar.add() when searching for next alarm."
am:
b52de8248f
* commit '
b52de8248f8e5f95f7984967e646eb9b3a641526':
Use GregorianCalendar.add() when searching for next alarm.
Jack Yu [Mon, 4 Jan 2016 18:04:34 +0000 (10:04 -0800)]
Fixed the incorrect cdma RAT detection logic.
Used the correct CDMA bitmask to determine if the bearer services
are based on 3GPP2 radio technologies.
bug:
26318528
Change-Id: Ic30c25aa7b67372898a041dd1f3a08a3abede394
Dan Sandler [Mon, 4 Jan 2016 19:58:42 +0000 (19:58 +0000)]
Merge "Use GregorianCalendar.add() when searching for next alarm."
Jason Monk [Mon, 4 Jan 2016 19:55:41 +0000 (19:55 +0000)]
Merge "Remove UserBoolean"
Winson Chung [Thu, 17 Dec 2015 22:08:55 +0000 (17:08 -0500)]
Refactoring lock-to-task state out of Task
- Moving the logic out of Task to the stack view which is more logical
and easier to manage
- This also includes a fix for the issue of the screen pinning not
showing up immediately after toggling it in Settings
Change-Id: I0357d59fc30b0327bbe6eeca10b310911aba3cc4
Jason Monk [Mon, 4 Jan 2016 19:54:40 +0000 (19:54 +0000)]
Merge "Better service management for QS 3rd party tiles"
Jason Monk [Mon, 21 Dec 2015 19:27:00 +0000 (14:27 -0500)]
Remove UserBoolean
Animate when the view is visible because its much simpler
Change-Id: I18598faae643124ad014f77a2e8a9229ccb726ce
Jason Monk [Mon, 21 Dec 2015 13:50:01 +0000 (08:50 -0500)]
Better service management for QS 3rd party tiles
Better wrapper around the service that will handle rebinding
when it dies, binding when it becomes available, and forwarding
along all messages to the service once it binds.
Also better handling of too many services at a time. Will only
ever bind to at most 3 tiles and will manage which ones are most
important to show based on pending clicks, last update, etc.
Change-Id: I5f4da0bc751f7eb25baa32e5c0bb9f1bc418f5bb
George Mount [Fri, 18 Dec 2015 15:43:42 +0000 (07:43 -0800)]
Tests for DatePicker keyboard interaction.
Bug
26187865
Change-Id: I26e990ef140d129f716eec0dff705e5f78b6608e
Alan Viverette [Mon, 4 Jan 2016 18:47:55 +0000 (18:47 +0000)]
Merge "Clean up date picker, add simple constructors and setter for listener"
Chong Zhang [Mon, 4 Jan 2016 18:32:16 +0000 (18:32 +0000)]
Merge "Fix popup window position calculation in multiwindow mode"
Wale Ogunwale [Thu, 24 Dec 2015 21:05:59 +0000 (13:05 -0800)]
Consolidate resume activity code around focused stack.
Cleaned up the code to make it obvious that only the top
activity in the focused stack should be in the resumes state.
Bug:
26273032
Change-Id: I8d60270f707fe022007c59d25f5678b33a005acf
Mathew Inwood [Mon, 4 Jan 2016 18:09:57 +0000 (18:09 +0000)]
Merge "Experimental: verify cached constructors before use."
Xiaohui Chen [Mon, 4 Jan 2016 17:21:45 +0000 (17:21 +0000)]
Merge "cleanup some confusing comments"
Felipe Leme [Mon, 4 Jan 2016 17:06:18 +0000 (17:06 +0000)]
Merge "Minor improvements on 'Take bug report' Action."
Tyler Gunn [Mon, 4 Jan 2016 16:33:37 +0000 (16:33 +0000)]
Merge "Fix capability/property checking methods to handle multi-bit capabilities."
Chris Wren [Tue, 15 Dec 2015 20:34:46 +0000 (15:34 -0500)]
implement assistant service connection
Added a guest-mode to ManagedServices.
Like system services, the lifecycle of a guest is not managed.
Unlike system services, guests are not considered privledged.
The Assistant gets all the usual listener events.
Implemented adjustImportance.
Future work: enqueued, clicked, visibility, removed, annotations
Bug:
22455414
Change-Id: Ic41c0bf625b5e98cb577b49098bba23a539bb507
John Reck [Mon, 4 Jan 2016 15:26:18 +0000 (15:26 +0000)]
Merge "Add some options to macrobench"
Geoff Mendal [Mon, 4 Jan 2016 13:53:33 +0000 (05:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I86141e2b59f4b3fd5adf1beb3a848d2dae49e871
Auto-generated-cl: translation import
Robin Lee [Mon, 4 Jan 2016 10:05:13 +0000 (10:05 +0000)]
Merge "Return null on getPrivateKey failure not exception"
Mathew Inwood [Thu, 31 Dec 2015 12:28:54 +0000 (12:28 +0000)]
Experimental: verify cached constructors before use.
Caching constructors can cause problems for dynamically loaded code if
the same class name appears in more than on classloader. Before using
cached constructors, verifty that they come from a valid classloader, i.e.
one that appears in the classloader chain of the current contexts
classloader. Remove ones that do not from the map to allow the associated
classes to be unloaded in case they're no longer in use.
Bug:
21690610
Change-Id: I84f2894cd03a5dc0c33aed9cd710e4a1f6d9515f
Dan Sandler [Tue, 29 Dec 2015 20:45:39 +0000 (15:45 -0500)]
Use GregorianCalendar.add() when searching for next alarm.
Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.
Bug:
26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
Jack Yu [Wed, 30 Dec 2015 22:34:12 +0000 (22:34 +0000)]
Reduced the radio log
am:
d2cf0ce9c1
* commit '
d2cf0ce9c17cd37a12827882b3a10512d2904103':
Reduced the radio log
Jack Yu [Wed, 30 Dec 2015 20:06:01 +0000 (12:06 -0800)]
Reduced the radio log
Reduced the radio log by moving some to VDBG or merging few lines
into one.
bug:
25956251
Change-Id: I290d894e95c9fdd664db35fd0cee3536c37dbd20
Xiaohui Chen [Wed, 30 Dec 2015 19:32:05 +0000 (11:32 -0800)]
cleanup some confusing comments
Change-Id: I21fe6fb2ea37a811f69278058277dd595866ae9b
Doris Liu [Wed, 30 Dec 2015 19:17:06 +0000 (19:17 +0000)]
Merge "VectorDrawable: Use the matrix scale only if the matrix has no rotation or skew."
Doris Liu [Tue, 29 Dec 2015 22:57:49 +0000 (14:57 -0800)]
VectorDrawable: Use the matrix scale only if the matrix has no rotation or skew.
When canvas is rotated or skewed, the scale factor is affected.
Conservatively reset the scale used to modify path stroke size to 1 in these
cases, since the image will be somewhat blurry anyway with rotation / skew..
b/
25418943
Change-Id: I6dff1bca5fac5500fa688c68f8b81b6212526b6b
Sudheer Shanka [Wed, 30 Dec 2015 18:17:30 +0000 (18:17 +0000)]
Merge "Update an error message."
Sudheer Shanka [Wed, 30 Dec 2015 17:45:40 +0000 (17:45 +0000)]
Update an error message.
Change-Id: Ifc32120ccccd14e8e821770995de91008ed518d7
Geoff Mendal [Wed, 30 Dec 2015 14:12:49 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 30 Dec 2015 14:06:22 +0000 (06:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8272ade26943091694be6ce0b8d7e8bbbc1e4ac6
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Dec 2015 14:02:31 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0e4698739718df41ce8fc1237bcb41fa87dd4b8a
Auto-generated-cl: translation import
Randy Pan [Tue, 29 Dec 2015 23:09:09 +0000 (15:09 -0800)]
resolve merge conflicts of
8c79fe5dc4 to master.
Change-Id: Id331e763f64ecbf8ed23764a487e32b94c4d3c09
Chong Zhang [Tue, 29 Dec 2015 22:50:05 +0000 (14:50 -0800)]
Fix popup window position calculation in multiwindow mode
When adjusting the popup's layout param to clip it to screen, we
have to convert x, y into screen coords to make any comparision
to the display frame, which is in screen coords.
bug:
25346252
Change-Id: I996286dec83ef2a1782dd2a66435eab45abf1bae
Chong Zhang [Mon, 28 Dec 2015 23:18:29 +0000 (15:18 -0800)]
Notify client when the window is moved because of a resize
We need to notify the client that the window has moved if a resize
results in a move without size change. This makes sure that relevent
info on client side (such as mAttachInfo.mWindowLeft/Top) gets updated
to the new frame. Things like View.getLocationOnScreen() may depend
on these to function.
Bug:
25565385
Change-Id: I5b9ded0b16243c14494f9a69257d56570ee8996d
Chong Zhang [Tue, 29 Dec 2015 21:40:08 +0000 (21:40 +0000)]
Merge "Crop to stack bounds during animation if docked task is non-resizeable"
Randy Pan [Thu, 17 Dec 2015 21:07:07 +0000 (13:07 -0800)]
Correct WiFi exponential back off scan
Correct the comments for exponential back off scan. Only binary
exponential back off scan is supported.
Updated the API doc. A couple of un-related fields which were
not updated get updated as well.
Bug:
26236392
Change-Id: I5668092f393b564aa40904ed609a51aa16890614
Mahaver Chopra [Tue, 29 Dec 2015 15:46:15 +0000 (15:46 +0000)]
Merge "DPM Test: DA and PO cannot call DPM.reboot()"
Mahaver Chopra [Wed, 23 Dec 2015 14:42:18 +0000 (14:42 +0000)]
DPM Test: DA and PO cannot call DPM.reboot()
Bug:
25304994
Change-Id: Ifaccf3625314f4bfcd7f99413abc9067cc3dd2f9
Gus Prevas [Tue, 29 Dec 2015 15:24:49 +0000 (15:24 +0000)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev am:
1d3bac82b3 am:
b805bb8b66 am:
19c7ad05f7
am:
5211f9bcbb
* commit '
5211f9bcbb2faba350e044c7d19f7af4e167b525':
Defines task to front/back animations in styles_micro.
Gus Prevas [Tue, 29 Dec 2015 15:20:39 +0000 (15:20 +0000)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev am:
1d3bac82b3 am:
b805bb8b66
am:
19c7ad05f7
* commit '
19c7ad05f7bc950ffe23dcb3d01668229b4735c1':
Defines task to front/back animations in styles_micro.
Gus Prevas [Tue, 29 Dec 2015 15:16:23 +0000 (15:16 +0000)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev am:
1d3bac82b3
am:
b805bb8b66
* commit '
b805bb8b660c5897e7a379fb2d79815269039271':
Defines task to front/back animations in styles_micro.
Gus Prevas [Tue, 29 Dec 2015 15:12:10 +0000 (07:12 -0800)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev
am:
1d3bac82b3
* commit '
1d3bac82b3bc59fd7225a3c27b32db2fc90b0308':
Defines task to front/back animations in styles_micro.
Gus Prevas [Tue, 29 Dec 2015 15:09:26 +0000 (15:09 +0000)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev
Adrian Roos [Tue, 29 Dec 2015 13:05:46 +0000 (13:05 +0000)]
Merge "Add reply text section to notifications"
Doris Liu [Tue, 29 Dec 2015 01:45:03 +0000 (01:45 +0000)]
Merge "VectorDrawable native rendering - Step 3 of MANY"
Pavlin Radoslavov [Tue, 29 Dec 2015 01:35:29 +0000 (01:35 +0000)]
Merge "Use GID "wakelock" to control access to kernel wakelock" am:
60d142c54b
am:
91fc6d1f9c
* commit '
91fc6d1f9cd5e83eec5753ef92960d03367c33a6':
Use GID "wakelock" to control access to kernel wakelock
Pavlin Radoslavov [Tue, 29 Dec 2015 01:31:16 +0000 (01:31 +0000)]
Merge "Use GID "wakelock" to control access to kernel wakelock"
am:
60d142c54b
* commit '
60d142c54b16be08d8352c7fd1510538014839f7':
Use GID "wakelock" to control access to kernel wakelock
Pavlin Radoslavov [Tue, 29 Dec 2015 01:24:14 +0000 (01:24 +0000)]
Merge "Use GID "wakelock" to control access to kernel wakelock"
Fyodor Kupolov [Tue, 29 Dec 2015 00:30:23 +0000 (00:30 +0000)]
Merge "Avoid byte[] allocations in writePackageListLPr"
Doris Liu [Wed, 2 Dec 2015 01:59:40 +0000 (17:59 -0800)]
VectorDrawable native rendering - Step 3 of MANY
- Refactored VPathRenderer & VectorDrawableState
- Moved all the VD rendering into native
- Set up hooks for VD's property changes in JNI for animated VD
TODO: JNI calls can be further reduced when we convert the animation
in AVD to use RenderNodeAnimator, in which case animation will be
driven from native and therefore most of the JNI hooks for changing
VD's properties during animation will no longer be needed.
Change-Id: I52021f4d7bea057b83ace54085d870dd45acae0f
Pavlin Radoslavov [Tue, 24 Nov 2015 01:13:25 +0000 (17:13 -0800)]
Use GID "wakelock" to control access to kernel wakelock
* Added GID "wakelock" (3010) to the list of groups the System Server
belongs to.
* Added GID "wakelock" to the list of assigned groups for the
"android.permission.BLUETOOTH_STACK" Android permission.
* Grant CAP_BLOCK_SUSPEND to processes that belong to GID "wakelock"
Bug:
25864142
Change-Id: I8a9a5f11e4a9ecd1abf2d4f4b90ec89b3101332e
Gus Prevas [Mon, 28 Dec 2015 20:02:13 +0000 (15:02 -0500)]
Defines task to front/back animations in styles_micro.
Bug:
26112737
Change-Id: I9f8c1da21580d525c32a76f25e223dc24d012837
Pavlin Radoslavov [Tue, 24 Nov 2015 01:13:25 +0000 (17:13 -0800)]
Use GID "wakelock" to control access to kernel wakelock
* Added GID "wakelock" (3010) to the list of groups the System Server
belongs to.
* Added GID "wakelock" to the list of assigned groups for the
"android.permission.BLUETOOTH_STACK" Android permission.
* Grant CAP_BLOCK_SUSPEND to processes that belong to GID "wakelock"
Bug:
25864142
Change-Id: I8a9a5f11e4a9ecd1abf2d4f4b90ec89b3101332e
Mark Salyzyn [Tue, 22 Dec 2015 21:02:39 +0000 (13:02 -0800)]
resolve merge conflicts of
94ab88228e to master.
Bug:
26178938
Change-Id: I1ec3421f4bb501942a0c06032d56cdaf06f56b45
Chong Zhang [Mon, 28 Dec 2015 19:09:01 +0000 (11:09 -0800)]
Crop to stack bounds during animation if docked task is non-resizeable
When a non-resizeable task is docked, it's running in fullscreen size, its
visible area should always be cropped to docked stack size. Otherwise wrong
size might show through during animation.
bug:
26163416
Change-Id: Idcbf4b86ae0976d86a2f91e78ccc2113dd86af62
Geoff Mendal [Mon, 28 Dec 2015 17:20:09 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 28 Dec 2015 17:13:40 +0000 (18:13 +0100)]
Import translations. DO NOT MERGE
Change-Id: Iad62ad98172733f52c0eb698db53568f74478070
Auto-generated-cl: translation import
Mihai Niță [Mon, 28 Dec 2015 15:35:22 +0000 (15:35 +0000)]
Merge "Add APIs to access various locale lists."
Geoff Mendal [Mon, 28 Dec 2015 14:00:31 +0000 (14:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 28 Dec 2015 13:59:37 +0000 (05:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I315d33bfa714351cf945e0798f57bc6ebaabc743
Auto-generated-cl: translation import
Geoff Mendal [Mon, 28 Dec 2015 13:53:52 +0000 (13:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 28 Dec 2015 13:53:30 +0000 (13:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 28 Dec 2015 13:48:01 +0000 (05:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I279881c50e7f1010a52f83b1ecb23477b8a8f44c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 28 Dec 2015 13:44:56 +0000 (05:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I57fcb1091c20531411b67a6ff0fab6ba973b8d3a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 28 Dec 2015 13:14:41 +0000 (05:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifca4884000d510796069729dce895e2fadbf6d77
Auto-generated-cl: translation import
Tomasz Mikolajewski [Mon, 28 Dec 2015 00:46:47 +0000 (00:46 +0000)]
Merge "Prevent double recreation of the failure dialog in DocumentsUI."
Tomasz Mikolajewski [Fri, 25 Dec 2015 08:06:52 +0000 (17:06 +0900)]
Prevent double recreation of the failure dialog in DocumentsUI.
DialogFragment takes care of recreation on configuration change, so no
need to recreate it manually.
Bug:
26322214
Change-Id: I7c50a1c5bb1ba9fab34f6e8d31ed1e23e7edfbb7
Daichi Hirono [Fri, 25 Dec 2015 07:09:38 +0000 (07:09 +0000)]
Merge "Stop to remove device rows at MtpDocumentsProvider."
Daichi Hirono [Fri, 25 Dec 2015 06:59:47 +0000 (15:59 +0900)]
Stop to remove device rows at MtpDocumentsProvider.
Previously MtpDocumentsProvider used to remove device info in the
database when the device is closed. It loses a chance that RootScanner
handles the removal of roots. As a result, notifications for root cursor
does not issued.
The CL stops removing device info at MtpDocumentsProvider, and let
RootScanner remove it.
BUG=
26321346
Change-Id: I6aec0cf843a1e5c93e7f67a718cabd26841d9799
Narayan Kamath [Thu, 24 Dec 2015 12:31:00 +0000 (04:31 -0800)]
Merge changes from topic \'aosp-merge-24-12\' am:
e0e81bf407
am:
f59c02a65e -s ours
* commit '
f59c02a65e9fd529467c4e5083d94ed6453e70f7':
Special case system_server to not create the JIT code cache.
Don't use IntegralToString
Track libcore commit
85d69e16fe1e59e50c1ad228e754abf325088362.
Track API changes to java.lang.ref.Reference.
Remove merge markers from preloaded-classes
Move StrictJarFile from libcore to framework
Switch RecoverySystem impl to use sun.security.pkcs
API update for OpenJdk based libcore
Use libcore/known_oj_tags for the javadoc stage.
Stop preloading fortress classes
Use HexDump instead of java.lang.IntegralToString
Add core-oj to the list of core library jars.
Narayan Kamath [Thu, 24 Dec 2015 12:07:42 +0000 (04:07 -0800)]
Merge changes from topic \'aosp-merge-24-12\'
am:
e0e81bf407
* commit '
e0e81bf407508ec096c752948f8794af5fd480ca':
Special case system_server to not create the JIT code cache.
Don't use IntegralToString
Track libcore commit
85d69e16fe1e59e50c1ad228e754abf325088362.
Track API changes to java.lang.ref.Reference.
Remove merge markers from preloaded-classes
Move StrictJarFile from libcore to framework
Switch RecoverySystem impl to use sun.security.pkcs
API update for OpenJdk based libcore
Use libcore/known_oj_tags for the javadoc stage.
Stop preloading fortress classes
Use HexDump instead of java.lang.IntegralToString
Add core-oj to the list of core library jars.
Narayan Kamath [Thu, 24 Dec 2015 11:56:44 +0000 (11:56 +0000)]
Merge changes from topic 'aosp-merge-24-12'
* changes:
Special case system_server to not create the JIT code cache.
Don't use IntegralToString
Track libcore commit
85d69e16fe1e59e50c1ad228e754abf325088362.
Track API changes to java.lang.ref.Reference.
Remove merge markers from preloaded-classes
Move StrictJarFile from libcore to framework
Switch RecoverySystem impl to use sun.security.pkcs
API update for OpenJdk based libcore
Use libcore/known_oj_tags for the javadoc stage.
Stop preloading fortress classes
Use HexDump instead of java.lang.IntegralToString
Add core-oj to the list of core library jars.
Roozbeh Pournader [Thu, 24 Dec 2015 04:54:37 +0000 (04:54 +0000)]
Merge "Remove some minimally supported locales from LocalePicker"
Roozbeh Pournader [Thu, 24 Dec 2015 04:50:31 +0000 (20:50 -0800)]
Remove some minimally supported locales from LocalePicker
For now, these locales are removed:
1. Mundang (mua): the name of the language is all-caps (while the
name of other languages in the locale are either lowercase or
titlecase.
2. Tachelhit (shi): It does not have the name of the Latin or
Tifinagh scripts that it's written in.
3. Vai (vai): It does not have the name of the Latin or Vai scripts
that it's written in.
4. Kashmiri (ks): The spelling of India uses incorrect Unicode
characters, and so do many other pieces of information in the locale.
5. Northen Luri (lrc): It doesn't have the name of the countries it's
spoken in (Iran and Iraq).
(The header of the config file is also fixed.)
Bug:
26279867
Change-Id: I52ad5f9058390f060705e21db62df81513d6ca6e
Daichi Hirono [Thu, 24 Dec 2015 04:07:27 +0000 (04:07 +0000)]
Merge "Fix flakiness MtpManagerTest test."
Daichi Hirono [Thu, 24 Dec 2015 03:43:12 +0000 (12:43 +0900)]
Fix flakiness MtpManagerTest test.
The test for readEvent cancelling was flakiness because it can
successfully receives an event before the test tries to cancel it.
Change-Id: Ie7625dff53e07b8bc9888da03e78155e683a6d46
Tomasz Mikolajewski [Thu, 24 Dec 2015 02:21:48 +0000 (02:21 +0000)]
Merge "Wire thumbnails in archives in ExternalStorageProvider."
Alex Cheung [Wed, 23 Dec 2015 22:48:52 +0000 (14:48 -0800)]
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/
26154276