213310 Commits

Author SHA1 Message Date
Martijn Coenen
e168012ff2 Merge "Implementation of HCE for NFC-F." 2016-01-25 09:48:43 +00:00
Chad Brubaker
056e8b5a5a Add getApplicationConfigForPackage
This allows services which make network connections on behalf of
applications to honor the application's network security policy.

Change-Id: I562b7bd0eb20f2f8c9f8342c211166d4e3397780
2016-01-22 22:04:20 -08:00
Jorim Jaggi
b7fbe1104f Merge "NullPointerException when starting VoiceInteractionManagerService" 2016-01-23 02:09:36 +00:00
Deepanshu Gupta
187c022bf1 Merge "Remove GregorianCalendar hack" 2016-01-22 23:53:07 +00:00
Dimitry Ivanov
ee5a181371 Remove path to the apk from the permittedPath
Bug: http://b/26732624
Bug: http://b/22548808
Change-Id: Idc63550f9ab67d30aaa0a1fd1b2d19545c07d1b9
2016-01-22 13:20:29 -08:00
Deepanshu Gupta
4f3d0c6caa Remove GregorianCalendar hack
Bug: http://b.android.com/199424
Change-Id: I589d153e1f57b6302c6fe3c031c5c63e33ad9996
2016-01-22 11:33:53 -08:00
David Gross
fca558c549 Merge "Add general reduction plumbing starting with Java Script::reduce()." 2016-01-22 17:00:43 +00:00
Yoshinobu Ito
c52adfe124 Implementation of HCE for NFC-F.
This impementation includes HCE(Host-based Card Emulation) for NFC-F
which emulates NFC Forum Type 3 Tag on a smartphone.

Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com>
               Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com>

Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
2016-01-22 18:14:18 +09:00
Marie Janssen
0c04ccd952 IBluetooth: remove dump(), support arguments
Because IBluetooth is a Binder service, we don't need dump() to
support dumpsys, just call the IBinder.dump().

Change-Id: Idcd48f758427b824e0b7eaafd091ba3fb2ff8993
2016-01-21 23:53:37 +00:00
Robert Greenwalt
4d9ffdf952 Merge "Add free short codes for Direct Carrier Billing and others." 2016-01-21 22:10:55 +00:00
John Reck
550d46d9da Merge "libhwui: fix texture memory leak" 2016-01-21 21:48:24 +00:00
Sergio Giro
eb93182dfb Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser" 2016-01-21 17:08:21 +00:00
Sergio Giro
ab72367506 org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
The name DistinguishedNameParser is used by other libraries having the
same package, and some apps incorrectly include packages that are
present in the boot classpath. This relatively newly introduced
DistinguishedNameParser ends up hiding the ones in the libraries.

Bug: 26647082
Change-Id: I735aef3c1e5dd04e5a8e2eda6da6d9c9179f1c70
2016-01-21 17:04:58 +00:00
Dohyun Lee
c5a3efd286 libhwui: fix texture memory leak
When there is not enough space and we cannot delete any
Texture in TextureCache to secure space, a new Texture is
created over and over again for the same SkBitmap and
there is the case that it is not deleted.
This patch avoids such cases.

Change-Id: Ic5353995e6d0716c31fe3bb49c60ec1a71574643
Signed-off-by: Dohyun Lee <leedhyun11@gmail.com>
2016-01-21 13:46:21 +09:00
Vasco Brito
f31caeaa8b Add free short codes for Direct Carrier Billing and others.
Whitelist free short code batch 2016 Q1 - Android Partner
Engineering.
All short codes are used by Direct Carrier Billing on
Google Play except for the short code 83669 in "gb" which
is used by a banking application.

Change-Id: Idbc02e697c8923288beb0b88545e6cee448ad4f5
Signed-off-by: Vasco Brito <vascob@google.com>
2016-01-20 23:39:23 +00:00
Sanket Agarwal
168f2e556b Merge "Add support for AVRCP 1.3." 2016-01-20 00:23:38 +00:00
Sanket Agarwal
ba12af5167 Add support for AVRCP 1.3.
* Add metadata support.
* Add player settings support.
* Add playback support.

A2DP Settings App support.

Bluetooth: A2DP Sink support for Settings App

- add support for A2DP Sink in Settings App. This will enable connection
  initiation and updation on Settings App
- add framework Apis to support A2DP Sink. Any third party Apps can access
  A2DP Sink priority of device and playing state of device
- add support for key to set priority. This manages priority of device for
  A2DP Sink profile

Change-Id: If5f9139f37cdb9d200387877c7801075205c78a0
2016-01-19 14:37:18 -08:00
John Reck
2c2b5e8514 Merge "fix race condition between HWUI cache and renderThread" 2016-01-19 18:29:30 +00:00
Thomas Buhot
c0a0e1a66d fix race condition between HWUI cache and renderThread
getMaximumBitmapWidth() and getMaximumBitmapHeight() of DisplayListCanvas
need HWUI cache instance. Since the initialization of the cache is
asynchronous it may crash if not yet ready. Add a staticFence() call
to guarantee the cache has been created prior issuing the call.

Change-Id: I5ed9e5cc084444c8d1872a77fef50e294ae14e93
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2016-01-19 15:00:42 +08:00
Dan Albert
dbf8c17bd2 Merge "Make the appropriate cast to protect from mingw." 2016-01-15 20:41:23 +00:00
David Gross
26ef7a739b Add general reduction plumbing starting with Java Script::reduce().
Requires coordinated change in frameworks/rs.

Bug: 23535724
Change-Id: I2fee6750cf542948d8fa87a98441002c4d84f36e
2016-01-15 12:20:08 -08:00
Dan Albert
ed811eeaea Make the appropriate cast to protect from mingw.
As the comment at the top of the file says:

    STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum
    value, so a cast is necessary.

Bug: http://b/26523949
Change-Id: I9d86cafdc47bbb9ce0e967cdde9315babc083432
2016-01-15 12:16:06 -08:00
Neil Fuller
b3ea05a56e Merge "Add thread safety documentation" 2016-01-15 16:27:16 +00:00
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
Edward Savage-Jones
7dbcbad577 NullPointerException when starting VoiceInteractionManagerService
If an end user disables the package that implements support for
Voice Assist (Google App) and reboots, an NPE is thrown during boot,
which results in the device getting stuck at the boot animation.

Recovery is not possible without USB debugging enabled, leaving factory
reset/user data wipe as the only other option.

Change-Id: I9c161fff7f096deee13bf8e37d951e20898ae3ff
2016-01-12 15:50:03 +00: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