OSDN Git Service
Geoff Mendal [Mon, 7 Mar 2016 15:20:15 +0000 (07:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4124a949eb423b0ab9074825c1eb7f00f1fd7302
Auto-generated-cl: translation import
Michal Karpinski [Mon, 7 Mar 2016 11:02:18 +0000 (11:02 +0000)]
Merge "Do not re-define remote bugreport constants defined in DevicePolicyManager" into nyc-dev
Daichi Hirono [Fri, 4 Mar 2016 09:43:21 +0000 (18:43 +0900)]
Fix null pointer exception in DocumentLoader.
BUG=
27489909
Change-Id: I1ebc9953f6db6639241d0c46257d110c5b0eb5b0
Diego Perez [Tue, 1 Mar 2016 16:20:43 +0000 (16:20 +0000)]
Add support for GradientColor in layoutlib
Change-Id: Ia9a55a9e00d7ddb5263f3dbe46b5da8dde457526
Insun Kang [Mon, 7 Mar 2016 06:31:21 +0000 (06:31 +0000)]
Merge "Fix wrong metadata conversion in MediaSessionLegacyHelper" into nyc-dev
Daichi Hirono [Mon, 7 Mar 2016 04:54:06 +0000 (04:54 +0000)]
Merge "Ensure to complete background thread of PipeManager." into nyc-dev
Yohei Yukawa [Mon, 7 Mar 2016 02:50:03 +0000 (02:50 +0000)]
Merge "Use Java7 diamond operator in TSMS." into nyc-dev
Keisuke Kuroyanagi [Mon, 7 Mar 2016 02:48:15 +0000 (02:48 +0000)]
Merge "Try to find equivalent SuggestionsSpan when it has been updated." into nyc-dev
Jaewan Kim [Mon, 7 Mar 2016 01:22:55 +0000 (01:22 +0000)]
Merge "PIP: Apply the latest UI spec for overlay text" into nyc-dev
Yohei Yukawa [Sun, 6 Mar 2016 22:34:55 +0000 (14:34 -0800)]
Use Java7 diamond operator in TSMS.
This CL changes nothing except for deleting redundant type parameters by
using diamond operator in TextServicesManagerService (TSMS).
No behavior change is intended.
Bug:
27456430
Change-Id: I18708fe44d2d9edfef8c1cf7cffef1bb0b5c003a
Yohei Yukawa [Sun, 6 Mar 2016 05:46:20 +0000 (21:46 -0800)]
Revert "Introduce script matching for enabling default IME subtypes."
This reverts commit
9e7a1c9824cffca32fd7d58bb13bd3416ab32091.
Seems that that CL causes ArrayIndexOutOfBoundsException when
initializing InputMethodManagerService, which results in an infinite
boot animation.
Bug:
27129703
Bug:
27348943
Change-Id: I474a87876670ac018c675ac7b4608e90fbb2434b
Wale Ogunwale [Sun, 6 Mar 2016 04:16:43 +0000 (04:16 +0000)]
Merge "Don't make home stack visible if starting activity isn't translucent" into nyc-dev
Wale Ogunwale [Fri, 4 Mar 2016 18:27:32 +0000 (10:27 -0800)]
Don't make home stack visible if starting activity isn't translucent
We allow the home stack to be visible right behind the fullscreen
stack if all the activities fullscreen stack are translucent and
visible. However, if we are starting an acitvity it isn't visible
yet so our check for translucent activities in the fullscreen
stack will return true since there is nothing visible. This will
cause the home stack to the visible and the visiblilty of its app
token set to true in window manager and it been factored into the
transition animation.
In addition to checking if the activity is visible, we now also
check if it is the starting activity when trying to determine if
the stack is translucent.
Bug:
27448511
Change-Id: Icbbd57c0632cc5389c7ac894800a41f75d4bc450
Seigo Nonaka [Sun, 6 Mar 2016 03:02:24 +0000 (03:02 +0000)]
Merge "Introduce script matching for enabling default IME subtypes." into nyc-dev
Seigo Nonaka [Sat, 5 Mar 2016 02:38:26 +0000 (18:38 -0800)]
Introduce script matching for enabling default IME subtypes.
The motivation of this CL is enhance the default IME subtype enabling
algorithm. The new approach is done by score based algorithm. The
design of the matching score is determined as follows:
- The matching score for the each two locale is up to 3 and determined
as follows:
- Score of 3 : matches all language, script and country.
- Score of 2 : matches the language and script.
- Score of 1 : matches the language regardless of country.
- Score of 0 : doesn't match the language regardless of script and
country.
- All locales are fully expanded before matching by addLikelySubtags in
ICU.
Bug:
27129703
Change-Id: I5bb1bd8cdb9096d516d60beb9936e55bf2b757ae
Jeff Sharkey [Sun, 6 Mar 2016 02:50:31 +0000 (02:50 +0000)]
Merge "Skip publishContentProviders() when we have zero." into nyc-dev
Jeff Sharkey [Sun, 6 Mar 2016 02:48:59 +0000 (19:48 -0700)]
Skip publishContentProviders() when we have zero.
If the list of providers for the application being bound is empty,
don't bother trying to register them.
Bug:
27510621
Change-Id: I921fb70a4c97433fa123fa88e170745ee013ee35
Jeff Sharkey [Sun, 6 Mar 2016 00:50:19 +0000 (00:50 +0000)]
Merge "Set default ringtones through RingtoneManager." into nyc-dev
Guang Zhu [Sun, 6 Mar 2016 00:48:34 +0000 (00:48 +0000)]
Merge "fix DocumentsUI tests makefile" into nyc-dev
Guang Zhu [Sat, 5 Mar 2016 23:46:46 +0000 (15:46 -0800)]
fix DocumentsUI tests makefile
For instrumentation test apks, it should not statically include
Java libraries that are already present in the app module being
instrumented. They only need to be on classpath during compile
time.
Bug:
26689464
Change-Id: I68d4be95e30ae70bbab23d016a87eb085c10cc50
Jeff Sharkey [Sun, 6 Mar 2016 00:43:20 +0000 (17:43 -0700)]
Set default ringtones through RingtoneManager.
RingtoneManager is the public API that everyone should be going
through, and it now has the side-effect of caching the set ringtone
to make it available before CE storage is unlocked.
Bug:
27435331
Change-Id: I30ed4e2df2ef1e4fd47f947c70845aaa74356384
Jeff Sharkey [Sun, 6 Mar 2016 00:29:00 +0000 (00:29 +0000)]
Merge "Ask RingtonePlayer to open data for caching." into nyc-dev
Jeff Sharkey [Sun, 6 Mar 2016 00:23:28 +0000 (17:23 -0700)]
Ask RingtonePlayer to open data for caching.
When setting default ringtones, RingtoneManager now caches the
selected media for playback before the device is unlocked. However,
this API hasn't historically required the caller to hold storage
permissions.
To keep this working, we attempt to delegate ringtone access over
through RingtonePlayer, which is what we do for playback. However,
because we're caching the real ringtone bits now, we need to be much
more careful about the PFDs we're willing to return. This change
requires that they be in external storage, and that they have the
ringtone/alarm/notification bit set.
Bug:
27366059
Change-Id: I59c2adc1d1250a3eac281f190f35a7cb3119967b
Jeff Sharkey [Sat, 5 Mar 2016 23:09:23 +0000 (23:09 +0000)]
Merge "Add AssetFileDescriptor to MediaExtractor." into nyc-dev
Jeff Sharkey [Sat, 5 Mar 2016 22:57:58 +0000 (15:57 -0700)]
Add AssetFileDescriptor to MediaExtractor.
Mirrors API on MediaPlayer.
Bug:
27506874
Change-Id: Ibc07cf8151c362ff7375b89e7a9044bef1d9e94d
Jeff Sharkey [Sat, 5 Mar 2016 22:28:33 +0000 (22:28 +0000)]
Merge "Kick Bluetooth stack after user is unlocked." into nyc-dev
Jeff Sharkey [Sat, 5 Mar 2016 21:42:58 +0000 (14:42 -0700)]
Kick Bluetooth stack after user is unlocked.
If Bluetooth was enabled at boot time, but the actual Bluetooth
package wasn't encryption aware, we need to kick off another enabled
pass once the user is unlocked.
Bug:
27326711
Change-Id: I511c4fd8567792e5bc4d49fa95929fd87edd0fbf
Jeff Sharkey [Sat, 5 Mar 2016 21:30:30 +0000 (21:30 +0000)]
Merge "Bluetooth should use Slog." into nyc-dev
Jeff Sharkey [Sat, 5 Mar 2016 21:29:13 +0000 (14:29 -0700)]
Bluetooth should use Slog.
It's in the system process, so whatever it has to say is probably
important enough to stick around.
Change-Id: Iaeca99d6b9c4881c53ab89216b5128e345a5ff0f
Jeff Sharkey [Sat, 5 Mar 2016 21:06:37 +0000 (21:06 +0000)]
Merge "Move more PM calls to ParceledListSlice." into nyc-dev
Adam Lesinski [Sat, 5 Mar 2016 06:30:32 +0000 (22:30 -0800)]
Remove accidentally committed core dump file
Change-Id: I610abfbce62585c25e98b5c36ac9f496861e66e7
Adam Lesinski [Sat, 5 Mar 2016 05:39:00 +0000 (05:39 +0000)]
Merge "AAPT2: Emit proper doclava comments in R.java" into nyc-dev
Adam Lesinski [Sat, 5 Mar 2016 05:38:05 +0000 (05:38 +0000)]
Merge "AAPT2: Support --no-version-vectors" into nyc-dev
Adam Lesinski [Thu, 3 Mar 2016 23:39:50 +0000 (15:39 -0800)]
AAPT2: Emit proper doclava comments in R.java
Bug:
25958912
Change-Id: I663f2eb5bd54e3c3288ce9bc186c928f0a014f93
Lifu Tang [Sat, 5 Mar 2016 01:28:47 +0000 (01:28 +0000)]
Merge "Fixed the crash caused by type mismatch" into nyc-dev
Svetoslav Ganov [Sat, 5 Mar 2016 01:25:32 +0000 (01:25 +0000)]
Merge "Don't crash legacy apps with revoked "Draw over apps access"" into nyc-dev
Winson Chung [Sat, 5 Mar 2016 01:21:01 +0000 (01:21 +0000)]
Merge changes I5c414d67,I83d74c94 into nyc-dev
* changes:
Just return the task to the pool if it is not in the current stack.
Refactoring to update stack in onResume.
Adam Lesinski [Thu, 3 Mar 2016 18:09:26 +0000 (10:09 -0800)]
AAPT2: Support --no-version-vectors
Change-Id: I8029b2f9e2f7ab8e37a49565f95210f47a7be609
Lifu Tang [Sat, 5 Mar 2016 01:01:06 +0000 (17:01 -0800)]
Fixed the crash caused by type mismatch
Bug:
27503442
Change-Id: I019afc1f3dd872c8f9d79e9b6e589a77acd0cddc
Winson [Fri, 4 Mar 2016 19:21:09 +0000 (11:21 -0800)]
Just return the task to the pool if it is not in the current stack.
Bug:
27467025
Change-Id: I5c414d674fb0db152b77c2025b4885d340e81880
Winson [Wed, 17 Feb 2016 21:27:33 +0000 (13:27 -0800)]
Refactoring to update stack in onResume.
This CL fixes a long-standing issue in which Recents is not updated
correctly if it is not completely hidden and shown. In particular, it
would cause animation issues when launching into a non-fullscreen
activity or if the user quickly toggles between recent tasks. It
contains several fixes:
- The visual state in Recents is no longer reset until the activity is
fully hidden (onStop() is called), and the task stack state is saved
allowing us to return to the same initial state. When restarting the
activity, we propagate whether the activity was hidden down the view
hierarchy, so that each task can decide whether to reset itself.
- When the recents activity is started, we now merge the new stack with
the current stack instead of replacing it completely. This unifies
the logic when dismissing multi-window while Recents is open, and this
CL fixes an issue with the merging where onStackTaskAdded() was called
before the stack was updated with the new task. As a result of this
change, we can just rebind the task views without having to return and
pick them up from the view pool.
- This CL also fixes an issue with flashing when the screen turns off.
The activity onStop() can be called before the activity is fully
hidden, which would trigger a reset(), which would return all views to
the pool.
Bug:
23815609
Bug:
25411120
Bug:
27186407
Change-Id: I83d74c947f9b47766d6778b7f5c421bb6df833e9
Aga Wronska [Sat, 5 Mar 2016 00:29:47 +0000 (00:29 +0000)]
Merge "Changed breadcrumb arrow to match mocks" into nyc-dev
Svet Ganov [Sat, 5 Mar 2016 00:13:03 +0000 (16:13 -0800)]
Don't crash legacy apps with revoked "Draw over apps access"
bug:
26396161
Change-Id: I8b86e175b4815e58ace78c37a86141c5e4dbe183
Chris Craik [Sat, 5 Mar 2016 00:19:09 +0000 (00:19 +0000)]
Merge "Support GPU profiling vis in new pipeline" into nyc-dev
Chris Craik [Fri, 4 Mar 2016 23:59:24 +0000 (15:59 -0800)]
Support GPU profiling vis in new pipeline
bug:
27353099
Change-Id: I905c1a998d9a9e2097c047dab9de87a70d7a370e
Aga Wronska [Sat, 5 Mar 2016 00:10:12 +0000 (16:10 -0800)]
Changed breadcrumb arrow to match mocks
Bug:
27136601
Change-Id: I03b3d789c1edf8de7f3d92238045cca123ce5e72
Adam Lesinski [Fri, 4 Mar 2016 23:46:48 +0000 (23:46 +0000)]
Merge "AAPT2: Support building, linking, and merging static libraries" into nyc-dev
Adrian Roos [Fri, 4 Mar 2016 23:37:02 +0000 (23:37 +0000)]
Merge "Fix BiDi issues in app error dialogs" into nyc-dev
Jeff Sharkey [Fri, 4 Mar 2016 23:16:00 +0000 (16:16 -0700)]
Move more PM calls to ParceledListSlice.
Since the data returned by these calls can grow unbounded based on
various GET flags, we need to switch 'em over.
Bug:
27391893
Change-Id: Ie849ca30dbaaa91158da4c83675657715629a0ee
Adrian Roos [Thu, 3 Mar 2016 23:39:03 +0000 (15:39 -0800)]
Log bouncer prompt reason
Bug:
27434873
Change-Id: I6918507b66506cf95b20f95fe4a5cb19c899122f
Jean-Michel Trivi [Fri, 4 Mar 2016 22:49:29 +0000 (22:49 +0000)]
Merge "API changes for audio recording notifications" into nyc-dev
Chris Wren [Fri, 4 Mar 2016 22:42:02 +0000 (22:42 +0000)]
Merge "add more comments from the other file" into nyc-dev
Adam Lesinski [Fri, 19 Feb 2016 02:33:06 +0000 (18:33 -0800)]
AAPT2: Support building, linking, and merging static libraries
Android static libraries are like APKs but they contain much more debugging
and source information. We need to treat them differently in 3 ways:
1) When building a static library, we skip things like ID assignment and
product/config stripping. Source information is emitted as well.
2) When building a static library and linking against another
static library, we don't want to merge, we want to simply reference.
3) When building an app that uses static libraries, we want to merge
the static library under the same package with or without mangling.
Bug:
25958912
Change-Id: I425e032857936a3e83173c1edc2a6cdc6020b842
Aga Wronska [Fri, 4 Mar 2016 22:37:39 +0000 (22:37 +0000)]
Merge "Made breadcrumb drop down match mocks" into nyc-dev
Chris Wren [Thu, 3 Mar 2016 20:38:40 +0000 (15:38 -0500)]
add more comments from the other file
Bug:
27429645
Change-Id: Ie903240af25a15f0f57cda5a8c57377d001a2f2c
Winson Chung [Fri, 4 Mar 2016 22:31:00 +0000 (22:31 +0000)]
Merge "Use the non-override task progress for calculating the z." into nyc-dev
Aga Wronska [Fri, 4 Mar 2016 22:03:45 +0000 (14:03 -0800)]
Made breadcrumb drop down match mocks
Bug:
27136601
Change-Id: I93af07a45defaddd7f5785fac8b686984a889583
Roshan Pius [Fri, 4 Mar 2016 22:01:04 +0000 (22:01 +0000)]
WifiScanner: Add PNO public API
am:
e4fd150962
* commit '
e4fd150962e07dbcb0646d556bf372be0cc15f1f':
WifiScanner: Add PNO public API
Julia Reynolds [Fri, 4 Mar 2016 21:47:55 +0000 (21:47 +0000)]
Merge "Redlines for inline settings." into nyc-dev
Joe Onorato [Fri, 4 Mar 2016 21:39:13 +0000 (21:39 +0000)]
Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev
* changes:
Turn down the logging a little bit.
Turn down the logging a little bit and don't do a log wrapper function.
Turn down the logging a little bit.
Turn down the logging a little bit.
Turn down the logging a little bit.
Turn down the logging a little bit.
Turn down the logging a little bit.
Roshan Pius [Tue, 1 Mar 2016 21:18:41 +0000 (13:18 -0800)]
WifiScanner: Add PNO public API
Add the public interface for starting/stopping PNO scan.
This is the internal flow that is going to be used for PNO scan:
1. Set Pno list
2. Start background scan
This flow will not work as is for supplicant, since background scan is
done manually today. So, we'll need a flag to indicate that this
background scan is targetted for PNO.
BUG:
27167559
Change-Id: I3f6921c5d03f7d9e8ad1847e57e12fb38df6c9c9
TEST: Compiles & unit-test passes
Jeff Sharkey [Fri, 4 Mar 2016 21:35:34 +0000 (21:35 +0000)]
Merge "Log FBE related flags when dumping packages." into nyc-dev
Chien-Yu Chen [Fri, 4 Mar 2016 21:01:32 +0000 (21:01 +0000)]
Merge "Camera2 Legacy: Connect to surfaces it produces" into nyc-dev
Suprabh Shukla [Fri, 4 Mar 2016 20:38:43 +0000 (20:38 +0000)]
Merge "Not clearing data for a package that is a DO or PO" into nyc-dev
Joe Onorato [Tue, 2 Feb 2016 01:49:31 +0000 (17:49 -0800)]
Turn down the logging a little bit.
Change-Id: Ib6e0e6f3577afac3b9bfe9a9b1cce70fb16d9d04
Joe Onorato [Tue, 2 Feb 2016 01:49:10 +0000 (17:49 -0800)]
Turn down the logging a little bit and don't do a log wrapper function.
Change-Id: I109f04c2c2299f26e21b076df3a935ce2d356bdf
Joe Onorato [Tue, 2 Feb 2016 01:48:18 +0000 (17:48 -0800)]
Turn down the logging a little bit.
Change-Id: Idc716000ba5d28f52aee3e1cb84832e1c6eaf440
Joe Onorato [Tue, 2 Feb 2016 01:47:06 +0000 (17:47 -0800)]
Turn down the logging a little bit.
Change-Id: I44c51d5f8248df1f8cca19da802ee891afe78af7
Joe Onorato [Tue, 2 Feb 2016 01:45:31 +0000 (17:45 -0800)]
Turn down the logging a little bit.
Change-Id: I810b9bd58412d2b38d8ce4497baa71047125b92f
Joe Onorato [Tue, 2 Feb 2016 01:44:36 +0000 (17:44 -0800)]
Turn down the logging a little bit.
Change-Id: I14762c5cc3706c31bd1b3868eac2528ae981aef8
Joe Onorato [Tue, 2 Feb 2016 01:44:14 +0000 (17:44 -0800)]
Turn down the logging a little bit.
Change-Id: I5760eb7d6d6ed5e8a3426e92c835e8a71e10cdbb
Eino-Ville Talvala [Fri, 4 Mar 2016 20:07:41 +0000 (20:07 +0000)]
Merge "DngCreator: Improve BlackLevel, fix thumbnail metadata" into nyc-dev
Steve McKay [Fri, 4 Mar 2016 19:54:34 +0000 (19:54 +0000)]
Merge "Revert "Hide Files app launcher icon."" into nyc-dev
Steve McKay [Fri, 4 Mar 2016 19:52:55 +0000 (19:52 +0000)]
Revert "Hide Files app launcher icon."
This reverts commit
24e46045956da911b385be33cff473bdacebf780.
Un-hiding this for continued development in nyc-dev.
Based on conversations between those at higher paygrades, we'll either leave this visible or re-hide prior to next dev release.
Change-Id: I235eb0f593daa7b34ea10ed4c9df4eaa6c68078c
Jeff Sharkey [Fri, 4 Mar 2016 19:52:36 +0000 (12:52 -0700)]
Log FBE related flags when dumping packages.
Bug:
27455726
Change-Id: I18146431792d5be0808ff6044174eff328039251
Steve McKay [Fri, 4 Mar 2016 19:42:33 +0000 (19:42 +0000)]
Merge "Hide Files app launcher icon." into nyc-dev
Julia Reynolds [Fri, 4 Mar 2016 16:11:46 +0000 (11:11 -0500)]
Redlines for inline settings.
Change-Id: I535f84f70444caf376b671352da8da94b764b1eb
Julia Reynolds [Fri, 4 Mar 2016 13:18:47 +0000 (08:18 -0500)]
Api Review: NotificationManager.Policy
Bug:
27365873
Change-Id: Ie53a410d53f430fa90f24d95a885be150a3d66aa
Winson [Fri, 4 Mar 2016 19:32:03 +0000 (11:32 -0800)]
Use the non-override task progress for calculating the z.
- This guarantees that they won’t collide, where as the override task
progresses will as tasks animate while dragging to dismiss.
Change-Id: I25eded22c13b38428d849062c6d95893f3fff5c5
Steve McKay [Fri, 4 Mar 2016 19:31:28 +0000 (11:31 -0800)]
Hide Files app launcher icon.
Bug:
27498061
Change-Id: Ifc76ef731a623e95839252a6c9483ce3546c9930
Adam Powell [Fri, 4 Mar 2016 19:27:16 +0000 (19:27 +0000)]
Merge "Stop ProgressBar animations when not visible" into nyc-dev
Eino-Ville Talvala [Wed, 2 Mar 2016 23:52:08 +0000 (15:52 -0800)]
DngCreator: Improve BlackLevel, fix thumbnail metadata
- Use new dynamic black level result key when available
- Write rational black level instead of integral value
- Fix incorrect thumbnail BitsPerSample metadata
- Fix incorrect date/time format string
- Fix unknown orientation
Test: dng_validate for captured DNGs is clean
Bug:
27452979
Bug:
25862995
Change-Id: I87b73f7a4f4ecc3cf6498c7db16df68dd0b0b43a
Aga Wronska [Fri, 4 Mar 2016 19:15:58 +0000 (19:15 +0000)]
Merge "Fixed arranging the views when in tablet landscape layout." into nyc-dev
Aga Wronska [Fri, 4 Mar 2016 18:53:50 +0000 (10:53 -0800)]
Fixed arranging the views when in tablet landscape layout.
Bug:
27473988
Change-Id: Id0333af9d9c63e1292d234543cd5950ae201f66a
Todd Kennedy [Fri, 4 Mar 2016 18:33:58 +0000 (18:33 +0000)]
Merge "dump apk signing version" into nyc-dev
Yorke Lee [Fri, 4 Mar 2016 18:27:19 +0000 (18:27 +0000)]
Merge "Add config value to force nav bar to be opaque" into nyc-dev
Adam Powell [Fri, 4 Mar 2016 00:51:17 +0000 (16:51 -0800)]
Stop ProgressBar animations when not visible
Propagate setVisible calls to current drawable. Take window visibility
into account when determining drawable visibility.
Bug
27461595
Change-Id: Ia1de1d1686f26c2cf27630c5bde70f23c2c332bd
Chris Craik [Fri, 4 Mar 2016 17:58:34 +0000 (17:58 +0000)]
Merge "Revert "Disable HWUI_NEW_OPS"" into nyc-dev
Chris Tate [Fri, 4 Mar 2016 17:57:07 +0000 (17:57 +0000)]
Merge "Don't use restricted backup launch mode for system-ish processes" into nyc-dev
Chris Craik [Fri, 4 Mar 2016 17:54:31 +0000 (17:54 +0000)]
Merge "Fix clip rect snapping at non-integer scale values" into nyc-dev
Yorke Lee [Fri, 4 Mar 2016 17:36:48 +0000 (17:36 +0000)]
Merge "Make isPanelFullyCollapsed public" into nyc-dev
Jason Monk [Fri, 4 Mar 2016 15:52:45 +0000 (15:52 +0000)]
Merge "Make QS do simpler anim on lock screen" into nyc-dev
Deepanshu Gupta [Fri, 4 Mar 2016 14:59:55 +0000 (14:59 +0000)]
Change BridgeResources to Resources_Delegate [DO NOT MERGE]
am:
9b137e27d3 -s ours
* commit '
9b137e27d34efb89024543ffd2def2b37307aa0c':
Change BridgeResources to Resources_Delegate [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Mar 2016 14:01:28 +0000 (19:31 +0530)]
Change BridgeResources to Resources_Delegate [DO NOT MERGE]
Do not merge because the resource implementation has changed in N and
the change is no longer valid there.
This is a very hacky fix to make layoutlib work with the latest support
lib. Inject a couple of fields in android.content.res.Resources to
allow using most of the earlier code as is.
Bug:
27403642
Bug: http://b.android.com/201934
Change-Id: I186cad32b1b4de64164fbad937d989e0110c6976
Narayan Kamath [Thu, 3 Mar 2016 22:35:46 +0000 (22:35 +0000)]
Track libcore change
e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33 (part 2).
Also includes a regenerated test-current.txt.
bug:
27426688
(cherry picked from commit
7d18ce744fff219ab60470ec095d585b854b91e1)
Change-Id: I754803d51d365ac1fe26c638b12efb88d23b35c6
Michal Karpinski [Fri, 4 Mar 2016 13:16:28 +0000 (13:16 +0000)]
Do not re-define remote bugreport constants defined in DevicePolicyManager
Bug:
26226230
Change-Id: Ib26d8ba872b1ebdf24b43312daa1d04b90a7f393
Victor Chang [Fri, 4 Mar 2016 13:13:26 +0000 (13:13 +0000)]
Merge "enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode" into nyc-dev
Victor Chang [Fri, 4 Mar 2016 13:13:12 +0000 (13:13 +0000)]
Merge "isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked" into nyc-dev
Narayan Kamath [Thu, 3 Mar 2016 22:35:46 +0000 (22:35 +0000)]
Track libcore change
e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
bug:
27426688
(cherry picked from commit
7d18ce744fff219ab60470ec095d585b854b91e1)
Change-Id: If22e493a80958ebd57ae5cc9d0f74d9479c86211
Narayan Kamath [Thu, 3 Mar 2016 22:23:37 +0000 (22:23 +0000)]
Track libcore commit
6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
Includes generated changes for test-current.txt.
bug:
27426688
(cherry picked from commit
de33c660df4a6ff8a138e3033c9e1d446bd6b570)
Change-Id: Idd323fe7458a2b124aae0009b4de83039e2ade21