213184 Commits

Author SHA1 Message Date
Neil Fuller
2c9d40a06e Add thread safety documentation
An upcoming change will remove "synchronized" from the API docs. This change
documents those cases where the guarantees can be determined from code
inspection.

Bug: 25767152
(cherry-picked from commit bf0dc0fba790cf95f76870c37469703f8f20a57c)

Change-Id: I328b96328e89950b90d537bf0a6a704242de4993
2016-01-15 16:26:26 +00:00
Neil Fuller
b0d92f4717 Merge "Fix @code escapes" 2016-01-15 16:22:16 +00:00
Neil Fuller
9498e8a8d2 Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
(cherry-picked from commit 71fbb81b14958b80fe55738607740c6630e4e9da)

Change-Id: I19dafddc6501be6fee362c396ac5bbdc934ae39d
2016-01-15 16:14:57 +00:00
Neil Fuller
9e892f53dd Merge "Hide static setDefault methods in ICU4J" 2016-01-14 22:20:16 +00:00
Robert Greenwalt
d736cba6e7 Merge "Add free short codes for Direct Carrier Billing in Google Play" 2016-01-13 20:35:34 +00:00
Samuel Tan
2e37bfd2d2 Merge "Remove PersistableBundle.aidl from Java framework" 2016-01-12 23:09:52 +00:00
Samuel Tan
239951a91e Remove PersistableBundle.aidl from Java framework
Remove PersistableBundle.aidl from the Java framework, since it
has been moved to the native libbinder.

BUG: 26292234
Change-Id: Ia3dc49a3ad92f4c579e6dff0606c1db8fb3be76b
TEST: aosp_arm builds successfully.
2016-01-12 14:43:32 -08:00
Michael Wright
6fa9c5cd01 Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl" 2016-01-12 22:20:52 +00:00
Michael Wright
3a87cb0192 Merge "Animate backlight quickly when display state request to change or power mode changed" 2016-01-12 21:46:38 +00:00
Kenny Root
a15ef2abab Merge "Track changes in libcore" 2016-01-12 20:59:32 +00:00
Kenny Root
790c944eca Track changes in libcore
The OCSP update added some API changes necessary to interact with it.
This change tracks the addition of the API.

Change-Id: I22c0448848747943bc039ff8e8fd0a1f0c531224
2016-01-12 12:58:07 -08:00
mochangming
f0cb46cd65 Animate backlight quickly when display state request to change or power mode changed
* mAppliedDimming should be false when power request policy is not dim.
  * mAppliedLowPower should be false when low power mode is disabled.
  * Backlight brightness changes quickly.

Change-Id: I44bf9c216554f8dce5abd0520f198824df5e8dcf
Signed-off-by: mochangming <mochangming@xiaomi.com>
2016-01-12 12:42:52 +08:00
Todd Kennedy
47950e588c Merge "Update PackageInstaller install handing" 2016-01-08 18:03:15 +00:00
Andreas Gampe
f2c7983de1 Merge "Frameworks/base: New preload tool" 2016-01-08 17:35:45 +00:00
Andreas Gampe
554d7ee0f5 Frameworks/base: New preload tool
Add a new preload tool based on hprof dumps. This means that only
a userdebug build (to adjust the pre-existing preloaded-classes
file) is required now, not a recompiled runtime.

Change-Id: Ib0c00de3b248e49fa8271cbace67c5d4a50170a1
2016-01-08 09:25:15 -08:00
Narayan Kamath
a909dad0c3 Merge "Trivial correction of Camera2 API description" 2016-01-08 09:36:14 +00:00
Narayan Kamath
9aeb6edf55 Merge "Fixed calendar fields comparison" 2016-01-08 09:30:41 +00:00
Philipp Hasper
81fd6b48a0 Fixed calendar fields comparison
Month was compared with the day and vice versa.
Found by dukejeffrie.

Change-Id: Ic4efca440c408325819ff1df85db7b407cf3207e
2016-01-08 09:29:39 +00:00
Hidenari Koshimae
0fa4914484 Trivial correction of Camera2 API description
Change-Id: Ibb3393b94812dfe7b496182bb5ef43f1a5df7434
2016-01-08 16:18:59 +09:00
Stephen Hines
766e20506c Merge "Remove graphics-related RenderScript tests." 2016-01-07 21:57:21 +00:00
Todd Kennedy
819d2745b4 Update PackageInstaller install handing
* Allow forcing permission check. We want to modify the PackageInstaller to
use the PackageInstallerSession for better security / remove deprecated APIs.
In order to do this and continue to prompt for permissions, we need to prevent
the PakcageInstaller from auto-approving the permissions.

* Add originating UID to SessionParams. This is used for package verifier
checks.

Bug: 22282121
Change-Id: I19079749d20ace66f1332f399d52cb0fb8784cd9
2016-01-07 13:51:16 -08:00
Alex Klyubin
d1240219aa Merge "[1/3] Remove unnecessary throws statement in ServiceManager" 2016-01-07 19:08:26 +00:00
Calin Juravle
5fac913d98 Merge "Create jit profile file during the app startup flow." 2016-01-07 11:44:55 +00:00
Calin Juravle
690523969d Create jit profile file during the app startup flow.
ActivityThread has already all the needed information
(userId,sharedAppId) to create the profile file and set the correct
permissions on it. This avoids passing uids to the runtime which now
expects the profile file to be already created.

As part of this change:
- move the registration with the runtim in handleBindApplication
- register only if needed: we could properly setup a profile file and we
have at least one code path. Note that registration with the runtime is
done solely for profiling reasons.

Bug: 26080105
Change-Id: I72657e9ea0a0449a09734456b5f8b5da844cee62
2016-01-07 11:29:38 +00:00
Umair Khan
9ccebbfc37 [1/3] Remove unnecessary throws statement in ServiceManager
The exception is already caught by the try-catch block.

Change-Id: I0c10fe51d12a10cbc02a25c719d03a4ba6497767
Signed-off-by: Umair Khan <omerjerk@gmail.com>
2016-01-07 15:08:27 +05:30
Wale Ogunwale
8683f1b160 Merge "[WindowManagerService] fix starting window issue" 2016-01-06 15:47:05 +00:00
Chad Brubaker
2786002bd5 Merge "Add ConfigNetworkSecurityPolicy" 2016-01-04 20:26:56 +00:00
Dan Sandler
b52de8248f Merge "Use GregorianCalendar.add() when searching for next alarm." 2016-01-04 19:58:42 +00:00
Ronnie Leng
a8d54b243b [WindowManagerService] fix starting window issue
Symptom:
1. Acitivity A and B belong to same task.
2. A is started and start B in its code
3. B is opened with blank screen

If starting icon has been display, both startingWindow and
startingView should not be null.
Current logic only uses judgement on startWindow. In above
case, it leads startingView set to null as A and B shares
the same starting window due to same task. Then system will
not get chance to remove startingView as it is null.

It needs add judgement on startingView.

Change-Id: I6cfa1a3ebce93ce435cc2d9ada239b1e808988de
2016-01-04 11:36:08 -06:00
Dan Sandler
12d3393249 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
2015-12-31 04:24:22 +00:00
Pavlin Radoslavov
60d142c54b Merge "Use GID "wakelock" to control access to kernel wakelock" 2015-12-29 01:24:14 +00: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
yang.xa.liu
40d73a7997 Make sure NaturalSurfaceLayout is consistent with SurfaceControl
SurfaceControl and NaturalSurfaceLayout will be created in screen-off
mode. Screen-on animation also creates NaturalSurfaceLayout. And
NaturalSurfaceLayout uses the reference of SurfaceControl.

SurfaceControl points to NULL when screen-on process calls destory
function, which will not be called in screen-off process. It makes
NaturalSurfaceLayout's member points to the SurfaceControl with NULL.
Crash occurs by accessing the destroyed SurfaceControl.

This CL makes the creation of SurfaceControl and NaturalSurfaceLayout
to one-to-one.

Change-Id: Ic47ea73dea67d2aba4e3e0766d1353198d7dff1d
2015-12-25 13:51:31 +09: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
Nicolas Geoffray
a877235156 Special case system_server to not create the JIT code cache.
(cherry picked from commit 3c43b3863328e339dff90b216aed15194d129e4a)

Change-Id: Ic7b0887f9edcb950fad98ccbe66cab6949fbdc52
2015-12-22 13:45:09 +00:00
Chad Brubaker
2eae60271a Don't use IntegralToString
Fix master build

(cherry picked from commit 7845e44c0cff3ec6a9ea0e5059fa1f7019ef0eb7)

Change-Id: Ic99a5e868b5d42e7bf72ef5388e30f070b6655d8
2015-12-22 13:41:08 +00:00
Narayan Kamath
5a3b4240fc Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362.
Unhide Pattern.UNICODE_CHARACTER_CLASS.

(cherry picked from commit c55d9e767a2ddaced89f4528ce0fce4f2f89357e)

Change-Id: I5c53d8db13948c5d143c05694f49872456c260eb
2015-12-22 13:10:55 +00:00
Narayan Kamath
7d059723b6 Track API changes to java.lang.ref.Reference.
(cherry picked from commit 12f62b7ec1e0d119541ab8febd337012248d2eb7)

Change-Id: I7a08d9de7cf39e4c3e11aa504e5e48a7edf17333
2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
d5f0eb0c84 Remove merge markers from preloaded-classes
(cherry picked from commit b0868054720a05d9e6d8ef6ee7e4c8c2d176f456)

Change-Id: Ieb1953e33dab7f852740872af110a938eb5c1ca4
2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
6a8ad6d161 Move StrictJarFile from libcore to framework
Bug: 25337946

(cherry picked from commit 8a7c1606d88873c5a1b5764c16cb046b6f2275b2)

Change-Id: I1bfce4129887d7cbfc02d92641b44920d7cdbbee
2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
62671eaa46 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
2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
5f3be92169 API update for OpenJdk based libcore
(cherry picked from commit 7e1fb09d0b8e94f55509c65aca797c467c810f89)

Change-Id: Idc1639d3bc751c5fa738bc661e6bb8077240bd3b
2015-12-22 13:10:55 +00:00
Narayan Kamath
a70412b206 Use libcore/known_oj_tags for the javadoc stage.
Helps us process (and discard) OpenJdk specific javadoc tags.

(cherry picked from commit 2c4f2843f4aa904c27dc78086bff039dbd295959)

Change-Id: Ib90ce70509fefa24608067db18cfc21c6c5d0590
2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
bb02b6704d Stop preloading fortress classes
(cherry picked from commit f1e520169309f1303d4383298dd5644df59efe4b)

Change-Id: I4fd13c4dc373482c1235b54746fdf7f029a80dc2
2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
e69a31d750 Use HexDump instead of java.lang.IntegralToString
java.lang.IntegralToString is being removed, replaced
all its usage by com.android.internal.util.HexDump.

(cherry picked from commit 3f72604be806c0173b5dca0225cadf6e7c872147)

Change-Id: I0527d580f5975dca0dfaa6f86fa3695dd49d0849
2015-12-22 13:10:55 +00:00
Piotr Jastrzebski
62ed63185c Add core-oj to the list of core library jars.
With some core classes moved to separate core-oj jar
we need to use the new jar.

(cherry picked from commit cfa292e1dad184648bf673167f3f35b4fb34fc93)

Change-Id: Iba481c3df029902a2bd0f9661d0819f4a191b2aa
2015-12-22 13:10:55 +00:00
Dimitry Ivanov
76a9e55a8f Merge "Use shared namespace for bundled app classloader" 2015-12-21 23:10:49 +00:00
Chad Brubaker
a2f2c5c340 Merge "Add hostname aware isCleartextTrafficPermitted" 2015-12-21 18:52:48 +00:00
Calin Juravle
db73912471 Merge "Pass app's code paths to the runtime" 2015-12-21 09:43:34 +00:00
Dimitry Ivanov
44fadb21e0 Use shared namespace for bundled app classloader
Allow bundled apps to reference platform native libraries
located in subdirectories of the default library path
(/system/lib/hw/* for example).

In addition to this bundled apps need to share native
libraries with default namespace. Added parameter to
ApplicationLoaders.createClassLoader() to do just that.

Bug: 26165097
Bug: 26164393
(cherry picked from commit 75b10ecccdd1881390075dd22c1d4f9bdf1c5828)

Change-Id: I836e5fed4713f2a605a5de673c40970ef6d988dd
2015-12-20 14:12:45 -08:00