Commit Graph

228563 Commits

Author SHA1 Message Date
Xiaohui Chen
dc630f0122 cleanup some confusing comments
Change-Id: I21fe6fb2ea37a811f69278058277dd595866ae9b
2015-12-30 11:32:05 -08:00
Mahaver Chopra
ecd7f715b3 Merge "DPM Test: DA and PO cannot call DPM.reboot()" 2015-12-29 15:46:15 +00:00
Mahaver Chopra
f8373b5afc DPM Test: DA and PO cannot call DPM.reboot()
Bug: 25304994
Change-Id: Ifaccf3625314f4bfcd7f99413abc9067cc3dd2f9
2015-12-29 15:39:02 +00:00
Gus Prevas
88efba96aa 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.
2015-12-29 15:24:49 +00:00
Gus Prevas
5211f9bcbb 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.
2015-12-29 15:20:39 +00:00
Gus Prevas
19c7ad05f7 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.
2015-12-29 15:16:23 +00:00
Gus Prevas
b805bb8b66 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.
2015-12-29 07:12:10 -08:00
Gus Prevas
1d3bac82b3 Merge "Defines task to front/back animations in styles_micro." into cw-e-dev 2015-12-29 15:09:26 +00:00
Adrian Roos
7213bdd104 Merge "Add reply text section to notifications" 2015-12-29 13:05:46 +00:00
Doris Liu
44b8102d71 Merge "VectorDrawable native rendering - Step 3 of MANY" 2015-12-29 01:45:03 +00:00
Pavlin Radoslavov
bfdf63eab6 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
2015-12-29 01:35:29 +00:00
Pavlin Radoslavov
91fc6d1f9c Merge "Use GID "wakelock" to control access to kernel wakelock"
am: 60d142c54b

* commit '60d142c54b16be08d8352c7fd1510538014839f7':
  Use GID "wakelock" to control access to kernel wakelock
2015-12-29 01:31:16 +00:00
Pavlin Radoslavov
60d142c54b Merge "Use GID "wakelock" to control access to kernel wakelock" 2015-12-29 01:24:14 +00:00
Fyodor Kupolov
db29e46ae9 Merge "Avoid byte[] allocations in writePackageListLPr" 2015-12-29 00:30:23 +00:00
Doris Liu
4bbc293126 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
2015-12-28 16:08:38 -08:00
Pavlin Radoslavov
fbd5904ce6 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
2015-12-28 15:14:44 -08:00
Gus Prevas
fcc57db731 Defines task to front/back animations in styles_micro.
Bug: 26112737
Change-Id: I9f8c1da21580d525c32a76f25e223dc24d012837
2015-12-28 15:02:13 -05:00
Pavlin Radoslavov
7016625473 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
2015-12-28 19:32:48 +00:00
Mark Salyzyn
6eb1a3e8c6 resolve merge conflicts of 94ab88228e to master.
Bug: 26178938
Change-Id: I1ec3421f4bb501942a0c06032d56cdaf06f56b45
2015-12-28 11:20:24 -08:00
Geoff Mendal
c127d656b5 Merge "Import translations. DO NOT MERGE" 2015-12-28 17:20:09 +00:00
Geoff Mendal
c9c5e066bf Import translations. DO NOT MERGE
Change-Id: Iad62ad98172733f52c0eb698db53568f74478070
Auto-generated-cl: translation import
2015-12-28 18:13:40 +01:00
Mihai Niță
73d92acee1 Merge "Add APIs to access various locale lists." 2015-12-28 15:35:22 +00:00
Geoff Mendal
f47ce26872 Merge "Import translations. DO NOT MERGE" 2015-12-28 14:00:31 +00:00
Geoff Mendal
431433b1f7 Import translations. DO NOT MERGE
Change-Id: I315d33bfa714351cf945e0798f57bc6ebaabc743
Auto-generated-cl: translation import
2015-12-28 05:59:37 -08:00
Geoff Mendal
81b44d0e51 Merge "Import translations. DO NOT MERGE" 2015-12-28 13:53:52 +00:00
Geoff Mendal
c6aad70022 Merge "Import translations. DO NOT MERGE" 2015-12-28 13:53:30 +00:00
Geoff Mendal
f395bfd9f1 Import translations. DO NOT MERGE
Change-Id: I279881c50e7f1010a52f83b1ecb23477b8a8f44c
Auto-generated-cl: translation import
2015-12-28 05:48:01 -08:00
Geoff Mendal
b0d78d487c Import translations. DO NOT MERGE
Change-Id: I57fcb1091c20531411b67a6ff0fab6ba973b8d3a
Auto-generated-cl: translation import
2015-12-28 05:44:56 -08:00
Geoff Mendal
02dae7f942 Import translations. DO NOT MERGE
Change-Id: Ifca4884000d510796069729dce895e2fadbf6d77
Auto-generated-cl: translation import
2015-12-28 05:14:41 -08:00
Tomasz Mikolajewski
c45dcaa88e Merge "Prevent double recreation of the failure dialog in DocumentsUI." 2015-12-28 00:46:47 +00:00
Tomasz Mikolajewski
aa684454f8 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
2015-12-25 18:22:52 +09:00
Daichi Hirono
b596175d80 Merge "Stop to remove device rows at MtpDocumentsProvider." 2015-12-25 07:09:38 +00:00
Daichi Hirono
8e3b9db544 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
2015-12-25 15:59:47 +09:00
Narayan Kamath
f4ea850c51 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.
2015-12-24 04:31:00 -08:00
Narayan Kamath
f59c02a65e 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.
2015-12-24 04:07:42 -08:00
Narayan Kamath
e0e81bf407 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.
2015-12-24 11:56:44 +00:00
Roozbeh Pournader
c800ff99cc Merge "Remove some minimally supported locales from LocalePicker" 2015-12-24 04:54:37 +00:00
Roozbeh Pournader
0a8bf0b36f 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
2015-12-23 20:53:06 -08:00
Daichi Hirono
3a682e8377 Merge "Fix flakiness MtpManagerTest test." 2015-12-24 04:07:27 +00:00
Daichi Hirono
4c4061210e 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
2015-12-24 12:45:03 +09:00
Tomasz Mikolajewski
7335d43007 Merge "Wire thumbnails in archives in ExternalStorageProvider." 2015-12-24 02:21:48 +00:00
Alex Cheung
39d1f6646a Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276 2015-12-23 14:48:52 -08:00
Geoff Mendal
784ac6c36b Merge "Import translations. DO NOT MERGE" 2015-12-23 20:07:32 +00:00
Geoff Mendal
cad921315d Import translations. DO NOT MERGE
Change-Id: Ic1ffdb6e18d84091b1abc67a45b8d8b9e8747d59
Auto-generated-cl: translation import
2015-12-23 18:18:28 +01:00
Geoff Mendal
cfb48ec8ba Merge "Import translations. DO NOT MERGE" 2015-12-23 13:54:59 +00:00
Geoff Mendal
de3c184a50 Merge "Import translations. DO NOT MERGE" 2015-12-23 13:54:39 +00:00
Geoff Mendal
bc97f81d7a Import translations. DO NOT MERGE
Change-Id: I3f6a2f37d640e10ad8ed5d0db0e7a81d4a5e8ef3
Auto-generated-cl: translation import
2015-12-23 05:53:57 -08:00
Geoff Mendal
0bf658d631 Import translations. DO NOT MERGE
Change-Id: I0e46010642ad4edb9bd12eb256518627d9d29107
Auto-generated-cl: translation import
2015-12-23 05:52:22 -08:00
Geoff Mendal
527b290674 Merge "Import translations. DO NOT MERGE" 2015-12-23 13:44:37 +00:00
Geoff Mendal
7da42323ca Import translations. DO NOT MERGE
Change-Id: I7cf42c018cfec707dc5fc1e55716de2ed7f1cacf
Auto-generated-cl: translation import
2015-12-23 05:40:31 -08:00