Commit Graph

51702 Commits

Author SHA1 Message Date
Todd Kennedy
0271416563 Merge "Update PackageInstaller install handing"
am: 47950e588c

* commit '47950e588c59ff58d12b3429d285e3330b9dfe01':
  Update PackageInstaller install handing
2016-01-08 18:11:33 +00:00
Todd Kennedy
47950e588c Merge "Update PackageInstaller install handing" 2016-01-08 18:03:15 +00:00
Narayan Kamath
7e308606f6 Merge "Trivial correction of Camera2 API description"
am: a909dad0c3

* commit 'a909dad0c36542ffbc155f98b4eb054921b1bbd0':
  Trivial correction of Camera2 API description
2016-01-08 09:44:34 +00:00
Narayan Kamath
cd51388e01 Merge "Fixed calendar fields comparison"
am: 9aeb6edf55

* commit '9aeb6edf5518a839156de7aab808a75a8fd6843b':
  Fixed calendar fields comparison
2016-01-08 09:39:21 +00:00
Narayan Kamath
a909dad0c3 Merge "Trivial correction of Camera2 API description" 2016-01-08 09:36:14 +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
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
4a06b7ea7e Merge "[1/3] Remove unnecessary throws statement in ServiceManager"
am: d1240219aa

* commit 'd1240219aadedc867b50158c67d1737a27fa7c6f':
  [1/3] Remove unnecessary throws statement in ServiceManager
2016-01-07 19:18:01 +00:00
Alex Klyubin
d1240219aa Merge "[1/3] Remove unnecessary throws statement in ServiceManager" 2016-01-07 19:08:26 +00:00
Calin Juravle
435ad029a3 Merge "Create jit profile file during the app startup flow."
am: 5fac913d98

* commit '5fac913d98eb44269b53cd9cc6a011a4eef3c98d':
  Create jit profile file during the app startup flow.
2016-01-07 11:52:50 +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
Jeremy Joslin
0807537ac2 Exit getAllValidScorers early if not the primary. am: 5b294b45d0
am: 2a5f880c9e

* commit '2a5f880c9e3c14c5e3421259f7904d9c352f79dc':
  Exit getAllValidScorers early if not the primary.
2016-01-06 21:48:30 +00:00
Jeremy Joslin
2a5f880c9e Exit getAllValidScorers early if not the primary.
am: 5b294b45d0

* commit '5b294b45d0d7afbed71fd2e59342c5ad7b8b7d76':
  Exit getAllValidScorers early if not the primary.
2016-01-06 21:43:24 +00:00
Jeremy Joslin
5b294b45d0 Exit getAllValidScorers early if not the primary.
This fixes the crash that occurs when getAllValidScorers() is invoked by
a non-primary user when a scorer is active.

BUG: 23040221
Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7
2016-01-05 17:44:05 -08:00
Chad Brubaker
a35d617cce Merge "Add ConfigNetworkSecurityPolicy"
am: 2786002bd5

* commit '2786002bd51b229d9a4672e3c43f835796de06ea':
  Add ConfigNetworkSecurityPolicy
2016-01-04 20:49:29 +00:00
Chad Brubaker
2786002bd5 Merge "Add ConfigNetworkSecurityPolicy" 2016-01-04 20:26:56 +00: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
Martijn Coenen
68521a6825 Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev am: 4bbd3c4819
am: c94df7c685

* commit 'c94df7c685947d8263f3617c3cd352a0bcd9e8c1':
  Clear calling identify b4 Beam callback.
2015-12-23 00:29:19 -08:00
Martijn Coenen
c94df7c685 Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev
am: 4bbd3c4819

* commit '4bbd3c4819fa9766442f6a063a4be2a786be8180':
  Clear calling identify b4 Beam callback.
2015-12-23 00:25:08 -08:00
Chad Brubaker
2eae60271a Don't use IntegralToString
Fix master build

(cherry picked from commit 7845e44c0c)

Change-Id: Ic99a5e868b5d42e7bf72ef5388e30f070b6655d8
2015-12-22 13:41:08 +00:00
Przemyslaw Szczepaniak
6a8ad6d161 Move StrictJarFile from libcore to framework
Bug: 25337946

(cherry picked from commit 8a7c1606d8)

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 9ad08ec5be)

Change-Id: I04848ad8f045f87224f9d30ff8dd745aac6d08fd
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 3f72604be8)

Change-Id: I0527d580f5975dca0dfaa6f86fa3695dd49d0849
2015-12-22 13:10:55 +00:00
Dimitry Ivanov
c53d159b3e Merge "Use shared namespace for bundled app classloader"
am: 76a9e55a8f

* commit '76a9e55a8fd751e747511a9c7d02dddca31964c3':
  Use shared namespace for bundled app classloader
2015-12-21 15:27:57 -08:00
Dimitry Ivanov
76a9e55a8f Merge "Use shared namespace for bundled app classloader" 2015-12-21 23:10:49 +00:00
Chad Brubaker
c642e052f0 Merge "Add hostname aware isCleartextTrafficPermitted"
am: a2f2c5c340

* commit 'a2f2c5c340b552b92088966734097845b76ea310':
  Add hostname aware isCleartextTrafficPermitted
2015-12-21 19:01:01 +00:00
Chad Brubaker
a2f2c5c340 Merge "Add hostname aware isCleartextTrafficPermitted" 2015-12-21 18:52:48 +00:00
Martijn Coenen
24584f0b34 Clear calling identify b4 Beam callback.
Fixes AppOps crash, because it notices the calling
package is different from the calling UID.

Bug: 25492633
Change-Id: I55e2d975fd0a7ee94c4623efb3b19b1b54b72da2
2015-12-21 10:33:06 +00:00
Calin Juravle
7d7ab7ad3b Merge "Pass app\'s code paths to the runtime"
am: db73912471

* commit 'db73912471df39aa527971f2884f37295616d3a9':
  Pass app's code paths to the runtime
2015-12-21 09:52:40 +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 75b10ecccd)

Change-Id: I836e5fed4713f2a605a5de673c40970ef6d988dd
2015-12-20 14:12:45 -08:00
Bryce Lee
76656c6b48 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 am: d980b8c7a0
am: 1b695edc97

* commit '1b695edc97c227a64ef810daee7dc9f3b35206a7':
  Remove duplicate Bluetooth profiles.
2015-12-18 23:19:18 +00:00
Bryce Lee
1b695edc97 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385
am: d980b8c7a0

* commit 'd980b8c7a05a2dc51145c3465c14f1f106a8bc47':
  Remove duplicate Bluetooth profiles.
2015-12-18 23:13:51 +00:00
Bryce Lee
d980b8c7a0 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
am: 9c27969385

* commit '9c27969385d7a59a535ba3274c279ae96a155d49':
  Remove duplicate Bluetooth profiles.
2015-12-18 23:07:49 +00:00
Bryce Lee
9c27969385 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev 2015-12-18 23:02:40 +00:00
Daniel Koulomzin
3f66df086a Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02 am: 898e330aae
am: 94794af6be

* commit '94794af6bee35c249857f0440c361d589b77aa5d':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.
2015-12-18 12:15:10 -08:00
Daniel Koulomzin
94794af6be Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02
am: 898e330aae

* commit '898e330aaedbfa9e41d649187800c307e3d84169':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.
2015-12-18 20:09:35 +00:00
Daniel Koulomzin
898e330aae Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
am: cbef517d02

* commit 'cbef517d02f4f3680e155cc1a704ebf5c959d03f':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.
2015-12-18 11:55:52 -08:00
Daniel Koulomzin
cbef517d02 Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev 2015-12-18 19:49:18 +00:00
Bryce Lee
15309a3d20 Remove duplicate Bluetooth profiles.
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
2015-12-18 11:34:20 -08:00
Daniel Koulomzin
087ae471c2 Making ViewRootImpl drop input events when the Activity is in ambient
mode.

WearableActivityController tells ViewRootImpl about ambient mode.

Bug: 25912259
Bug: 25973146
Bug: 25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
2015-12-18 12:56:00 -05:00
Bryce Lee
6b9e5bf0c2 Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am: cf91b45c05 am: 9eaa59a1ff
am: 132814f20d

* commit '132814f20d2e0920c419042d55c8e50ace827dba':
  Add setting for declaring disabled bluetooth profiles.
2015-12-17 19:56:12 +00:00
Bryce Lee
132814f20d Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am: cf91b45c05
am: 9eaa59a1ff

* commit '9eaa59a1ff315bbf4d9809b30bf7777aa88e6bee':
  Add setting for declaring disabled bluetooth profiles.
2015-12-17 19:51:17 +00:00
Bryce Lee
9eaa59a1ff Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
am: cf91b45c05

* commit 'cf91b45c05358c81ddaccf3ddd4b1ea6d5295faa':
  Add setting for declaring disabled bluetooth profiles.
2015-12-17 11:45:17 -08:00
Bryce Lee
cf91b45c05 Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev 2015-12-17 19:40:47 +00:00
Calin Juravle
f19c9638dd Pass app's code paths to the runtime
The runtime needs the application's main code paths so it know for which
dex files to record the profile.

Bug:26080105
Change-Id: I5f2cb5c140aa6893ac78bc0d5897e33764569e5b
2015-12-17 12:38:27 +02:00
Samuel Tan
4981ae9083 Merge "Add comments to keep Java and native binder PersistableBundle in sync"
am: 6de926a7d6

* commit '6de926a7d6439745cd0f01a69a5dd75b006b923d':
  Add comments to keep Java and native binder PersistableBundle in sync
2015-12-17 00:54:03 +00:00
Samuel Tan
d3decff052 Merge "Fix PersistableBundle handling in Parcel.writeValue"
am: d12959193c

* commit 'd12959193c60254b6b03b2a60a9c6e598e9da2e5':
  Fix PersistableBundle handling in Parcel.writeValue
2015-12-17 00:50:53 +00:00