OSDN Git Service
Xiaohui Chen [Wed, 30 Dec 2015 19:32:05 +0000 (11:32 -0800)]
cleanup some confusing comments
Change-Id: I21fe6fb2ea37a811f69278058277dd595866ae9b
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
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
Geoff Mendal [Wed, 23 Dec 2015 20:07:32 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 23 Dec 2015 17:18:28 +0000 (18:18 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ic1ffdb6e18d84091b1abc67a45b8d8b9e8747d59
Auto-generated-cl: translation import
Geoff Mendal [Wed, 23 Dec 2015 13:54:59 +0000 (13:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 23 Dec 2015 13:54:39 +0000 (13:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 23 Dec 2015 13:53:57 +0000 (05:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3f6a2f37d640e10ad8ed5d0db0e7a81d4a5e8ef3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 23 Dec 2015 13:52:22 +0000 (05:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0e46010642ad4edb9bd12eb256518627d9d29107
Auto-generated-cl: translation import
Geoff Mendal [Wed, 23 Dec 2015 13:44:37 +0000 (13:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 23 Dec 2015 13:40:31 +0000 (05:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7cf42c018cfec707dc5fc1e55716de2ed7f1cacf
Auto-generated-cl: translation import
Geoff Mendal [Wed, 23 Dec 2015 13:38:43 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 23 Dec 2015 13:37:14 +0000 (05:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I26b3d71c972ae0f9757845441999564e504f9183
Auto-generated-cl: translation import
Geoff Mendal [Wed, 23 Dec 2015 13:18:27 +0000 (05:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib6ebdd5bbdb5d5186533ca875ed0d2f69e31f7c1
Auto-generated-cl: translation import
Martijn Coenen [Wed, 23 Dec 2015 08:33:26 +0000 (00:33 -0800)]
Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev am:
4bbd3c4819 am:
c94df7c685
am:
68521a6825
* commit '
68521a682524c53e6bfd883a3f41b4fe514c2d0c':
Clear calling identify b4 Beam callback.
Martijn Coenen [Wed, 23 Dec 2015 08:29:19 +0000 (00:29 -0800)]
Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev am:
4bbd3c4819
am:
c94df7c685
* commit '
c94df7c685947d8263f3617c3cd352a0bcd9e8c1':
Clear calling identify b4 Beam callback.
Martijn Coenen [Wed, 23 Dec 2015 08:25:08 +0000 (00:25 -0800)]
Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev
am:
4bbd3c4819
* commit '
4bbd3c4819fa9766442f6a063a4be2a786be8180':
Clear calling identify b4 Beam callback.
Martijn Coenen [Wed, 23 Dec 2015 08:22:21 +0000 (08:22 +0000)]
Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev
Mihai Nita [Wed, 23 Dec 2015 07:13:43 +0000 (23:13 -0800)]
Add APIs to access various locale lists.
This includes APIs to get / set the user locale list,
and getters for the curated list of supported locales,
localized assets, and pseudo-locales.
Change-Id: Ie5771d769cd4a01f6404fa82f6f4f9bcb9b83a9e
Bug:
25800339
Philip P. Moltmann [Wed, 23 Dec 2015 04:08:00 +0000 (20:08 -0800)]
Rename variable that hides the contatining classes name.
Change-Id: Iad0a9b341a866d33d10b7a389d243e677a65057c
Philip P. Moltmann [Thu, 17 Dec 2015 00:57:05 +0000 (16:57 -0800)]
Prefer printers that have been used physically close to the current
location of the user.
Commonly the users prints on a printer that this near the user current
location. Hence if possible we want to show the user printers that he
used before and that are close to him.
Hence store the location of the previous uses of a printer and prefer
printer that are close to the user.
Unfortunately getLastLocation might not report a usable location and it
will take at least 5 seconds until the first usable location arrives. At
this time the user might have already opened the destionation spinner.
It would be unexpected for the printers to suddenly change under the
users finger. Hence it might be that we did first show the printer
without any location information and then once the location is known we
cannot update thedestination spinner anymore.
The select printer activity does not have this issue, hence in the worst
case the user has to enter this activity to select a printer and by then
the location is usually determined.
This is not ideal but better than before.
Bug:
24133609
Change-Id: Ie7d20cf3d9dd163e57903f8f6ecc0b3fd4f4374e
Filip Gruszczynski [Wed, 23 Dec 2015 02:20:49 +0000 (02:20 +0000)]
Merge "Only use DecorContext with main activity windows."
Philip P. Moltmann [Wed, 23 Dec 2015 02:11:01 +0000 (02:11 +0000)]
Merge "Clean up print subsystem"
Philip P. Moltmann [Wed, 23 Dec 2015 01:28:07 +0000 (01:28 +0000)]
Merge "Close closeguard of PageContentRepository."
Philip P. Moltmann [Fri, 18 Dec 2015 21:58:40 +0000 (13:58 -0800)]
Clean up print subsystem
- Stop using deprecated APIs
- Fix all public and some internal javadoc
- Add @Decorations to public APIs
- Some minor cleanup, e.g. don't use variables with overlapping names in same scope
- remove unnecessary properties from manifest (they are set by the build
system)
Change-Id: I0ce8849a516414763fe9de76c3a18ce17d896816
Ben Kwa [Wed, 23 Dec 2015 01:13:03 +0000 (01:13 +0000)]
Merge "Adjust grid margins to match mocks."
Ben Kwa [Wed, 23 Dec 2015 01:11:33 +0000 (01:11 +0000)]
Merge "Fix various band select instabilities."
Ben Kwa [Wed, 23 Dec 2015 01:11:12 +0000 (01:11 +0000)]
Merge "Update grid items to look more like the mocks."
Ben Kwa [Wed, 23 Dec 2015 00:45:01 +0000 (16:45 -0800)]
Adjust grid margins to match mocks.
BUG=
25560424
Change-Id: I11edfd9585299acb22ca14b518274ae2538a7d01
Jun Mukai [Wed, 23 Dec 2015 00:00:08 +0000 (00:00 +0000)]
Merge "Fix a crash. InputDevice can be null."
Robert Greenwalt [Fri, 4 Dec 2015 19:51:49 +0000 (11:51 -0800)]
Check permissions on getDeviceId. DO NOT MERGE
This needs the package name passed in, so the aidl changes.
bug:
25778215
Change-Id: I69ee88f1d2db614bad51e6de908d3f16881a0231
Ben Kwa [Tue, 22 Dec 2015 23:27:14 +0000 (15:27 -0800)]
Fix various band select instabilities.
- Guard against OutOfBoundsExceptions by checking for
RecyclerView.NO_POSITION before attempting to retrieve model IDs in
various places.
- Fix a spot where the default return value of
SparseIntArray.get (i.e. 0) was causing item 0 to incorrectly get
selected.
BUGS=
26249027,
26309874
Change-Id: I08d2e8c90bdd40a4738bdcf357de31e8fe6ddecf
Filip Gruszczynski [Tue, 22 Dec 2015 22:46:21 +0000 (14:46 -0800)]
Only use DecorContext with main activity windows.
Bug:
26251921
Change-Id: Icd41eddd4f39b95a136ee366673fabbef9d4def0
Ben Kwa [Tue, 22 Dec 2015 22:03:30 +0000 (14:03 -0800)]
Update grid items to look more like the mocks.
- Create a new layout for directory items, which have a different
layout (no thumbnail, size or mod_date).
- Add drop shadows.
Also refactor a few things in the DocumentHolder and child classes to
make things more efficient and cleaner.
BUG=
24326989,
26229570
Change-Id: I05df52b071667190d4c4c671f50d25498383cdaa
Vladislav Kaznacheev [Fri, 18 Dec 2015 20:23:43 +0000 (12:23 -0800)]
Bind DropPermissions life cycle to Activity
Move requestDropPermissions from DragEvent to Activity.
Permissions will be granted using UriPermissionOwner
associated with this activity and revoked when the activity
is destroyed (if DropPermissions.release is not called before that).
Change-Id: Ic8f8fc3f56f57e83b9bc34ae8c96d82c2c9c4e1d
Jun Mukai [Tue, 22 Dec 2015 22:20:24 +0000 (14:20 -0800)]
Fix a crash. InputDevice can be null.
Bug:
26306228
Change-Id: I2ada939cbacb9886bd04da791b185eb49a0a2f55
Aga Wronska [Tue, 22 Dec 2015 22:08:08 +0000 (22:08 +0000)]
Merge "Pressing back button clears search"
Dan Willemsen [Tue, 22 Dec 2015 21:55:36 +0000 (21:55 +0000)]
Merge "AAPT2: Fix compiler error in 32-bit host test"
Philip P. Moltmann [Tue, 22 Dec 2015 21:49:30 +0000 (21:49 +0000)]
Merge "Allow a print service to specify per printer icons, description and info-activities"
Dan Willemsen [Tue, 22 Dec 2015 21:01:05 +0000 (13:01 -0800)]
AAPT2: Fix compiler error in 32-bit host test
We now default host native tests to build both 32-bit and 64-bit
versions.
The 32-bit version of libaapt2_test was broken because it was comparing
an unsigned int to the result from std::count(std::vector), which is a
signed int. The 64-bit version compiled fine, since
std::count(std::vector) returns a long.
Change-Id: I786fcd8a54d9f78b76b19ef82ab8dda6f5c42197
Aga Wronska [Mon, 21 Dec 2015 19:43:40 +0000 (11:43 -0800)]
Pressing back button clears search
Bug:
26143308
Change-Id: Iaa02d39a6ee1fd1a0c7d4d07453a481af97c7664
Rob Carr [Tue, 22 Dec 2015 21:07:45 +0000 (21:07 +0000)]
Merge "Set SCALING_MODE_NO_SCALE_CROP for SurfaceView."
David Riley [Tue, 22 Dec 2015 18:45:06 +0000 (18:45 +0000)]
Merge "SystemUI: implement bluetooth scan timeout"
Filip Gruszczynski [Tue, 22 Dec 2015 17:29:39 +0000 (17:29 +0000)]
Merge "Add a permission to shell for running multi window tests."
Filip Gruszczynski [Tue, 22 Dec 2015 17:22:34 +0000 (09:22 -0800)]
Add a permission to shell for running multi window tests.
Bug:
19225708
Change-Id: Ia2de679b133acee992ccdab3bfddbdd9d78f5025
Benjamin Franz [Tue, 22 Dec 2015 17:00:19 +0000 (17:00 +0000)]
Merge "Allow device and profile owner to modify accounts"
Jason Monk [Tue, 22 Dec 2015 16:37:24 +0000 (16:37 +0000)]
Merge "QS: Fix header layout when alarm set"
Jason Monk [Tue, 22 Dec 2015 16:34:36 +0000 (11:34 -0500)]
QS: Fix header layout when alarm set
Change-Id: I9f16ccb545abaea85ecaca29a221599c767003b8
Benjamin Franz [Thu, 5 Nov 2015 10:06:51 +0000 (10:06 +0000)]
Allow device and profile owner to modify accounts
The user restriction DISALLOW_MODIFY_ACCOUNTS and the policy
DPM.setAccountManagementDisabled can now be circumvented by a device
or profile owner. This allows the device or profile owner to add
accounts without briefly having to remove the policy.
Bug:
22030831
Change-Id: I2b59c4b3ad354287d7a00f21b2afef072d12517d
Chris Wren [Tue, 22 Dec 2015 15:37:04 +0000 (15:37 +0000)]
Merge "that works, but can you find a more efficient solution?"
Chris Wren [Tue, 22 Dec 2015 15:34:22 +0000 (10:34 -0500)]
that works, but can you find a more efficient solution?
Change-Id: I19f8ff61973d8db5614f9a699b28df7038e44711
Jorim Jaggi [Mon, 21 Dec 2015 09:58:56 +0000 (10:58 +0100)]
Reenable colored bars for multiwindow
Fix the previous bug that caused that we needed to disable colored bars
by only forcing the layout fullscreen flag for windows that would like
to be laid out with MATCH_PARENT.
Bug:
26050571
Bug:
24365214
Change-Id: I4f197ae5e2bf042980f5e8dc9eb852843af9859c
Filip Gruszczynski [Tue, 22 Dec 2015 15:08:44 +0000 (15:08 +0000)]
Merge "Remove confusing logging about surface size."
Nicolas Geoffray [Fri, 11 Dec 2015 15:01:04 +0000 (15:01 +0000)]
Special case system_server to not create the JIT code cache.
(cherry picked from commit
3c43b3863328e339dff90b216aed15194d129e4a)
Change-Id: Ic7b0887f9edcb950fad98ccbe66cab6949fbdc52
Chad Brubaker [Tue, 1 Dec 2015 21:03:27 +0000 (13:03 -0800)]
Don't use IntegralToString
Fix master build
(cherry picked from commit
7845e44c0cff3ec6a9ea0e5059fa1f7019ef0eb7)
Change-Id: Ic99a5e868b5d42e7bf72ef5388e30f070b6655d8
Narayan Kamath [Sun, 20 Dec 2015 20:17:40 +0000 (20:17 +0000)]
Track libcore commit
85d69e16fe1e59e50c1ad228e754abf325088362.
Unhide Pattern.UNICODE_CHARACTER_CLASS.
(cherry picked from commit
c55d9e767a2ddaced89f4528ce0fce4f2f89357e)
Change-Id: I5c53d8db13948c5d143c05694f49872456c260eb
Narayan Kamath [Wed, 9 Dec 2015 15:59:03 +0000 (15:59 +0000)]
Track API changes to java.lang.ref.Reference.
(cherry picked from commit
12f62b7ec1e0d119541ab8febd337012248d2eb7)
Change-Id: I7a08d9de7cf39e4c3e11aa504e5e48a7edf17333
Przemyslaw Szczepaniak [Wed, 2 Dec 2015 11:32:22 +0000 (11:32 +0000)]
Remove merge markers from preloaded-classes
(cherry picked from commit
b0868054720a05d9e6d8ef6ee7e4c8c2d176f456)
Change-Id: Ieb1953e33dab7f852740872af110a938eb5c1ca4
Przemyslaw Szczepaniak [Tue, 3 Nov 2015 09:47:56 +0000 (09:47 +0000)]
Move StrictJarFile from libcore to framework
Bug:
25337946
(cherry picked from commit
8a7c1606d88873c5a1b5764c16cb046b6f2275b2)
Change-Id: I1bfce4129887d7cbfc02d92641b44920d7cdbbee
Przemyslaw Szczepaniak [Thu, 9 Jul 2015 12:28:30 +0000 (13:28 +0100)]
Switch RecoverySystem impl to use sun.security.pkcs
Due to org.apache.harmony.security package removal,
RecoverySystem#verifyPackage was rewritten to use
sun.security.pkcs package for verifining package
signature.
(cherry picked from commit
9ad08ec5be0d1e225c9f463fd395ba852b6b5bba)
Change-Id: I04848ad8f045f87224f9d30ff8dd745aac6d08fd
Przemyslaw Szczepaniak [Thu, 19 Nov 2015 16:39:03 +0000 (16:39 +0000)]
API update for OpenJdk based libcore
(cherry picked from commit
7e1fb09d0b8e94f55509c65aca797c467c810f89)
Change-Id: Idc1639d3bc751c5fa738bc661e6bb8077240bd3b