13747 Commits

Author SHA1 Message Date
Amith Yamasani
f20d640fa2 Restrictions Manager
Mechanism to register a provider for requesting an
administrator to respond to permission requests.

Request format and response format constants.

Description of manifest template for static restrictions.
Int type introduced in RestrictionEntry.

Needs more javadoc and better description of manifest templates,
including specifying the XML attributes.

Change-Id: I5a654d364e98379fc60f73db2e06bf9a8310263d
2014-05-31 16:41:35 -07:00
Jeff Brown
094b2136f0 resolved conflicts for merge of 92ab0b91 to master
Change-Id: I66d6849700759163669faa930f07a7e968df5155
2014-05-29 18:25:11 -07:00
Jeff Brown
92ab0b91cd am aeb4e071: Merge "Add dumpsys to dock observer." into klp-modular-dev
* commit 'aeb4e071abb100d10c39d154b05c2911d399395d':
  Add dumpsys to dock observer.
2014-05-30 01:01:17 +00:00
Jeff Brown
010e561a70 Add dumpsys to dock observer.
Minor refactoring of dock observer to allow its state to be
inspected and modified via dumpsys for debugging purposes.

eg. View current state.
adb shell dumpsys DockObserver

eg. Simulate being docked.
adb shell dumpsys DockObserver set state 1

eg. Reset back to normal.
adb shell dumpsys DockObserver reset

Change-Id: Ie48db775290ebed9aa4d9d9d5ac5a6fcb6122ac9
2014-05-29 17:48:33 -07:00
Brian Carlstrom
77b170cedc resolved conflicts for merge of 452c5921 to klp-modular-dev-plus-aosp
Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678
2014-05-28 16:10:53 -07:00
Brian Carlstrom
452c592191 am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '197565e0e800be3c731e679914f40afa1aab98fd':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:39 +00:00
Brian Carlstrom
5bc93866b0 Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175

(cherry-picked from commit 2ef5abb8d534f016582d6023054cbe69d8114b6b)

Change-Id: Icd91982c09076e87092906106cbff4a81589e8de
2014-05-28 14:53:40 -07:00
Brian Carlstrom
3c1ff826e0 Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175
Change-Id: I8afa91bddfb6fec6b61c39286a16594eb947830e
2014-05-28 14:31:47 -07:00
Christopher Tate
fa380e982e DO NOT MERGE - Run the task manager service at startup
Also moves most of it into android.app.task rather than android.content.

(Cherrypick from master)

Change-Id: Ic07a664bf54bc3e40aa0b892946edba4bf37262a
2014-05-23 16:41:09 -07:00
Dmitriy Ivanov
2137d6a843 am d5ee4144: Merge "Increase start timeout for wrapped process"
* commit 'd5ee4144c4beae54219e1b8eb10418b02dd4a63b':
  Increase start timeout for wrapped process
2014-05-23 02:35:42 +00:00
Dmitriy Ivanov
c774dcee9d Increase start timeout for wrapped process
* apparently 300*1000 for valgrind is not enough
   (hammerhead aosp tot).

Change-Id: Ia3f26cb67d3aa0ebdec68f3c1a764bad5e7f4f95
2014-05-22 12:40:25 -07:00
Lorenzo Colitti
f9ff2c9ae5 Make the EthernetManager available.
Change-Id: I7a60e977d7a40a5d0367168f2f6633ccae591ac4
2014-05-21 16:41:24 -07:00
narayan
ab3d85ab1a am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '838b1e2215cbc27e77530f4c79124c088353e0e7':
  Fix NPE in PackageManagerService.
2014-05-21 20:17:52 +00:00
narayan
0cfe875ac5 Fix NPE in PackageManagerService.
Check that each package from the setting has
a parsed pkg before we attempt to perform dex-opt
on it. If it doesn't have a parsed package, adjust
the ABI in the settings, but don't perform dexopt.
It will be dexopted later if it's still active
based on the setting.

bug: 15081286

Change-Id: Ifb6d1d5efdc9c59b251731972afa951ad930d05c
2014-05-21 21:00:48 +01:00
Brian Carlstrom
e77a77d081 am ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit 'ec71fed089965c4d731eaa90344849a1775f937a':
  Improve ABI handling for shared user ids.
2014-05-21 06:46:26 +00:00
Yuhao Zheng
8a476edccd Fix a boot failure due to Wifi / Wifi Passpoint
Bug: 15060373
Change-Id: Ie72fd2e4b855c46a8f9ed12deb8b07fd0c29f522
2014-05-20 14:06:49 -07:00
Vinit Deshpande
e715e8cc00 Fix a runtime break caused by merge conflict
Kwd changed the name of WifiHotspotService to PasspointService; and
the reference to the name was moved in master. Merge ended up picking
up incorrect name WifiPasspointService. This change fixes that.

Bug: 15106138
Change-Id: Ib6d8aee53db39314a9d98abcbd8e0863210de1bb
2014-05-20 11:50:17 -07:00
Narayan Kamath
b851c89d22 Improve ABI handling for shared user ids.
The key improvement is that we need to keep track of
the package that's currently being scanned (this includes
new installs and upgrades of existing packages) and treat
it specially. If we didn't do that, In the case of upgrades
we would perform the shared UID calculation based on the ABI
of the old package, and not the current package.

This change also allows us to perform the CPU ABI calculation
before dexopt, which saves us from having to do it twice and
fixes a bug where we were using the wrong package path to
dexopt a package.

This also has the side effect of fixing 15081286.

bug: 15081286

Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
2014-05-20 14:09:12 +01:00
Narayan Kamath
deda5467f4 am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
* commit 'a4fd1baac68dcd73957e0fca0c02089ecf9a268a':
  Fail if we're unable to agree on an ISA for shared UIDs.
2014-05-19 13:29:57 +00:00
Narayan Kamath
20ee78ab95 Fail if we're unable to agree on an ISA for shared UIDs.
It's not worth the complexity of rescanning the APK and
extracting a shared library with a different ABI.

Also gets rid of an unnecessary command line argument and
checks for dex-opt failures while adjusting shared ABIs.

bug: 14453227

Change-Id: I6a0695e24cba37e93540c540507088e95b89089b
2014-05-19 14:24:46 +01:00
Yuhao Zheng
a486447231 Hotspot 2.0 framework APIs -- initial implementation
Cherry-picked from klp-wireless-dev-mirror
SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4

Bug: 5485670
Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5
2014-05-18 09:41:35 -07:00
Narayan Kamath
6e2e686889 am 706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '706b1d7ea0214b6858730e68c95c6a6d6d9a4c30':
  Remove "required" prefix from ABI fields.
2014-05-15 12:41:47 +00:00
Narayan Kamath
6e35a2ad05 Remove "required" prefix from ABI fields.
As per a comment on an earlier code review.

(cherry-picked from commit a9d64733421d6765eab5c2730fa912f068e26047)

Change-Id: I064cffc13c323b721f3a16c83e0e95ee348ef9f6
2014-05-15 10:57:05 +01:00
Brian Carlstrom
2ce02bba1e am b7d7cbc9: Merge "Fix background PackageUsage writing."
* commit 'b7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a':
  Fix background PackageUsage writing.
2014-05-13 00:34:42 +00:00
Brian Carlstrom
112a720638 Fix background PackageUsage writing.
Change-Id: Ia358b61e648b427c86cf75ae096cd2a68ace209f
2014-05-12 16:56:34 -07:00
Brian Carlstrom
edc31509c2 am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
* commit 'b98ca5b0dd73f374178022b4a4b37412f01a3c03':
  If PackageUsage information is missing, treat as first boot and compile everything
2014-05-09 17:33:04 +00:00
Brian Carlstrom
7c5c864c8a If PackageUsage information is missing, treat as first boot and compile everything
Bug: 14663243
Change-Id: I0ae33882044211f777590f482e17e87596be4463
2014-05-09 09:52:09 -07:00
Eric Laurent
82af2b9e51 Merge "AudioService/WireAccessoryManager: change boot completion detection method" 2014-05-08 23:25:49 +00:00
Vinit Deshapnde
011e1b35a6 Initial implementation of WifiScanner
This change implements basic functionality of WifiScanner. Following
functionality is enabled

1. Scanning - specify a list of channels to scan
2. Significant change detection
3. AP hotlist

Change-Id: Ieef75b96bdbbd3c7d9b9e698bd16e64d3b465254
2014-05-07 21:14:24 -07:00
vandwalle
7c3606c103 initial Best Network Selection implementation
-add dhcpserver, defaultGwMAC address, linked configuration and user choices link lists to WiFiconfiguration
-add default gateway mac address to RouteInfo
-add a Date to the ScanResult
-add BSSID date to the WifiConfiguration
- make framework auto-join into a config option
- add Settings option for showing RSSI in Wifi picker view; add auto-join specific status to WifiConfiguration

Change-Id: I5cfc4f2a48c9f3bc9766e8e68e24eff7b57f2821

 Changes to be committed:
	modified:   core/java/android/provider/Settings.java
	modified:   wifi/java/android/net/wifi/ScanResult.java
	modified:   wifi/java/android/net/wifi/WifiConfiguration.java
2014-05-07 18:48:48 -07:00
Brian Carlstrom
dfad99ad9f resolved conflicts for merge of 0b5598c9 to master
Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
2014-05-07 15:24:01 -07:00
Brian Carlstrom
0b5598c924 am 691079dd: am a21ba5be: Merge "Add BackgroundDexOptService"
* commit '691079ddc0055fac9b82dccaf35b4591978b2a55':
  Add BackgroundDexOptService
2014-05-07 20:28:25 +00:00
Brian Carlstrom
691079ddc0 am a21ba5be: Merge "Add BackgroundDexOptService"
* commit 'a21ba5bec748e2f10d7e6d38181ec1124991cb60':
  Add BackgroundDexOptService
2014-05-07 03:33:41 +00:00
Brian Carlstrom
f2db00fdcd am edb88bcd: Merge "Use package usage information to decide what dex files to optimize in PackageManagerService"
* commit 'edb88bcd232176e575f2dbee2cfdb1bfbe33faef':
  Use package usage information to decide what dex files to optimize in PackageManagerService
2014-05-07 03:33:37 +00:00
Brian Carlstrom
7395a8ab8a Add BackgroundDexOptService
Change-Id: I0439a04f693ba92df906cbda34f8e53b32f63329
2014-05-06 15:14:29 -07:00
Brian Carlstrom
ff1ec4d9e7 Use package usage information to decide what dex files to optimize in PackageManagerService
Change-Id: Iac137311e2e9d5139b5aa8651c6f3d296802612a
2014-05-06 15:06:25 -07:00
Eric Laurent
4a5eeb9c72 AudioService/WireAccessoryManager: change boot completion detection method
BOOT_COMPLETED intent is not a reliable way for system services
to detect boot completion. The intent broadcast can be significantly
delayed and there is no guaranty that system services
receive it before apps.

Use a systemReady() method called by SystemServer instead.

Bug: 14323903.
Change-Id: I781596a3545e7a1e719799982347cbcd9a4c9009
2014-05-06 10:49:04 -07:00
Brian Carlstrom
e3cceef7ec am 0f7c0570: Merge "Minor cleanup of UsageStatsService"
* commit '0f7c0570e091a284481c2406d8275d87c3786c1d':
  Minor cleanup of UsageStatsService
2014-05-01 21:41:58 +00:00
Brian Carlstrom
393fbe71f8 Minor cleanup of UsageStatsService
Change-Id: Idea0e29f347d14e48e87aad38a261d0493bd5fd3
2014-05-01 14:12:14 -07:00
RoboErik
67e2196d07 Merge "Add dump to MediaSessionService" 2014-05-01 17:11:34 +00:00
Narayan Kamath
5dca099df7 am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
* commit '1cec7f8539e6465ff80577169d7d07df3c2574b7':
  Don't adjust ABI if PackageSetting#pkg is null.
2014-05-01 14:00:52 +00:00
Narayan Kamath
c1f81f9086 am 27f2bfc4: Merge "Fix dex file pruning logic."
* commit '27f2bfc406157039c5241f6a4f38f597b2076e2a':
  Fix dex file pruning logic.
2014-05-01 14:00:49 +00:00
Narayan Kamath
51f4367cac am bcc3b312: Merge "Adjust instruction sets for shared UID apps."
* commit 'bcc3b312b0662ae2f8b8444eaedd5f35fc75c411':
  Adjust instruction sets for shared UID apps.
2014-05-01 14:00:46 +00:00
Narayan Kamath
69da8a124e am 2a9a0471: Merge "Package manager changes for dual zygote stack."
* commit '2a9a047140b8da8f9cd7147c8bed60eeb61d1b6a':
  Package manager changes for dual zygote stack.
2014-05-01 14:00:43 +00:00
Narayan Kamath
d85ded890d am 645a920f: Merge "Fix OEM native library path bug."
* commit '645a920fd2c478c545c6bb659f2eab36545fe116':
  Fix OEM native library path bug.
2014-05-01 13:56:59 +00:00
Narayan Kamath
eb5734989b am 986b901a: Merge "Fix native-lib dir assignment & updating"
* commit '986b901ae280928e91193527f7c883b296fc62fc':
  Fix native-lib dir assignment & updating
2014-05-01 13:56:56 +00:00
Narayan Kamath
f465db9f1d Don't adjust ABI if PackageSetting#pkg is null.
If means the package hasn't been scanned yet, and we
will adjust the ABI during the scan of the last package
in the shared user group.

NOTE: This needs some more cleaning up, which will be
done along with the remaining TODO in this function.

(cherry picked from commit 6609990e35b11c38f55f6e632160d4f2ff201ea3)

Change-Id: Ibace7849485865054e062d2b979f320bf89ff0f3
2014-05-01 13:56:43 +00:00
Narayan Kamath
57156572a7 Fix dex file pruning logic.
We should now prune all normal files from /data/dalvik-cache
in addition to looking for dex files in all subdirectories of
/data/dalvik-cache.

(cherry picked from commit 51a6f9253399588eedf77d75c578d9aa23d11529)

Change-Id: I536dfdc48e94155e7be64eb4efd9f7f2a1d2d00a
2014-05-01 13:56:22 +00:00
Narayan Kamath
1b46093d33 Adjust instruction sets for shared UID apps.
Since shared UID apps are run in the same process,
we'll need to make sure they're compiled for the same
instruction set.

This change implements the recompilation of apps that
don't have any ABI constraints.

Apps that *do* have ABI constraints are harder to deal
with, since we'll need to rescan them to figure out the
full list of ABIs they support and then re-extract the
native libraries from these apps once we find an ABI we
can use throughout.

(cherry picked from commit 85703d58af1dac692d7d83c03220e45ab2a5aded)

Change-Id: I8311a683468488cc7e30381965487a3d391609ae
2014-05-01 13:55:35 +00:00
Narayan Kamath
0349e8c478 Package manager changes for dual zygote stack.
- Pass down the app's instruction set to dexopt so that
  it can compile the dex file for the right architecture.

- Also pass down the app's instruction set to rmdex, movedex
  and getSize so that they can construct the cache file
  location properly.

- Temporarily compile "system" jars such as am,wm etc. for
  both architectures. A follow up change will ensure that
  they're compiled only for one architecture (the same
  arch. as the system server).

- Java "shared" libraries are now compiled for the right
  architecture when an app requires them.

- Improve the app native library ABI detection to account
  for system apps installed in /system/lib{64}/<packagename>
  and also handle sdcard and forward locked apps correctly.

(cherry-picked from commit b4d35dc8e9702f9d0d82d35a105f0eea35672b52)
2014-05-01 13:54:48 +00:00