18239 Commits

Author SHA1 Message Date
Jeff Sharkey
4ec2023349 Merge "Derive library path for upgraded system apps." 2014-07-07 17:47:39 +00:00
Jeff Sharkey
8d479b0c2d Derive library path for upgraded system apps.
Bug: 16156270
Change-Id: I368433063ff33d15129c8076ddc6f1e2a0963e54
2014-07-08 14:57:40 -07:00
Jeff Sharkey
65b1a7c0ba Offer to scan cluster packages at boot.
Bug: 14975160
Change-Id: Ib637f68354b3d4ce4b5b23d875d8e94ccd497fd2
2014-07-08 01:04:51 -07:00
Jeff Sharkey
d746057f24 Change new file installs to be cluster-based!
Now that all the other pieces are in place, we're ready to start
installing new file-based packages as a cluster (the new unified
directory-based layout).  This greatly simplifies the renaming
process.

Also add helper methods to ApplicationInfo to give a much clearer
mapping between it and internal field names, since we can't change
the public API.

Add recursive restorecon().

Bug: 14975160
Change-Id: I72a63c5ddbc594c2fec4a91dd59f73ef253fbfd7
2014-07-08 00:38:57 -07:00
Christopher Tate
e64fb99144 Merge "Fix NPE in platform restore" 2014-07-08 18:08:48 +00:00
Christopher Tate
8f1bb3a0d4 Fix NPE in platform restore
Bug 16061451

Change-Id: I79d7913455886828a493a0c4ea850d259bfeeeab
2014-07-08 13:00:33 -07:00
Makoto Onuki
f621a5b1b3 Merge "Cross-user provider access no longer requires ..._FULL" 2014-07-08 17:33:57 +00:00
Makoto Onuki
4451419fc6 Cross-user provider access no longer requires ..._FULL
Now only INTERACT_ACROSS_USERS is required.

Change-Id: If5bdbfb055d9d57a3180885f2aea652b889e7705
2014-07-08 12:05:05 -07:00
Robert Greenwalt
9eb38a6ffa Merge "Remove dead code." 2014-07-06 02:28:07 +00:00
Robert Greenwalt
8283f8802d Remove dead code.
Also adds a TYPE_VPN so the VPN can be strongly typed.

Change-Id: Ibf39450c480f16ce5ab4c25b47965691b844fb92
2014-07-07 17:09:01 -07:00
Jungshik Jang
255edb556e Merge "Fix broken build." 2014-07-02 19:52:36 +00:00
Jungshik Jang
8866c810b6 Fix broken build.
Change-Id: I9b0fe05a090238f27f226111e344f68c119ef4f7
2014-07-08 14:42:28 +09:00
Jungshik Jang
8f2ed357a2 Handle <Set Osd Name> in TV.
When TV receives <Set Osd Name> it should update the name of
device and should notify them who are listening device changes.

Bug: 16115666
Change-Id: Ic3b60def8858ca5b7041202135d5dcaf47fa06e7
2014-07-08 14:15:13 +09:00
Jungshik Jang
42230728b8 Add port number to hot plug event handler.
This is to remove a TODO about adding port number to
jni interface.

Bug: 15844074
Change-Id: I4dba0879527035a4cabad6cc80e359e6c1fd39b0
2014-07-08 14:05:59 +09:00
Jinsuk Kim
c4ae64d541 Merge "Intent definition for HdmiControlService for OSD display" 2014-07-02 20:35:42 +00:00
Jungshik Jang
24c23c1dd8 Remove a TODO checking device power.
Since we enforce to run poll devices when hot plug event is fired,
we don't need to have arc management triggered by separate +5 power change.

Bug: 15841645
Change-Id: I619f8975688f63cb09cb7a296de52b558b494901
2014-07-08 14:03:06 +09:00
Jinsuk Kim
c7eba0f1db Intent definition for HdmiControlService for OSD display
Intent action/extra for TV app to show a message on screen about events
HdmiControlService need to report for user's attention. The app
needs system permission HDMI_CEC to receive the intent.

Change-Id: I4fbe4621efa20a17ca64a3ca8f2df64bee03c51b
2014-07-08 14:02:38 +09:00
Yuncheol Heo
347a604499 Fix the initial values of HDMI HAL options.
- We define the default value of OPTION_CEC_ENABLE as enabled, but OEM's
  default was disabled.
- Fix the initial value of OPTION_CEC_SERVICE_CONTROL as enabled.

Change-Id: If4a69fd2a87739b9f6f7b9a5a5a2a5cdd514d48f
2014-07-08 13:53:58 +09:00
Jinsuk Kim
119160a681 Add vendor-specific command API for HdmiControl
Vendor-specific commands are not handled by the service. This CL
opens an API for vendors to implement customized handling of
CEC commands specific to their needs.

Change-Id: I8bfa3b891bd7994a903b3b41d7c2b27464167afa
2014-07-08 04:46:05 +00:00
Winson Chung
88085ad05b Merge "Refactoring to support groups." 2014-07-07 17:47:39 +00:00
Winson Chung
ffa2ec6644 Refactoring to support groups.
- Removing RecentService, determining animations just in time
- Fixing a few issues with animations of newly picked up tasks from the pool
- Moving helper classes into sub package

Change-Id: Ie10385d1f9ca79eea918b16932f56b60e2802304
2014-07-07 17:33:31 -07:00
Craig Mautner
95f621a1a4 am 3bc1bafa: am 6d6d2189: am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."
* commit '3bc1bafabaedffede8963703cf3bfde2054ef91a':
  [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
2014-07-07 21:30:57 +00:00
Craig Mautner
3bc1bafaba am 6d6d2189: am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."
* commit '6d6d2189625a679948920861b957948b505cb53f':
  [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
2014-07-07 21:24:41 +00:00
Craig Mautner
6d6d218962 am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."
* commit '08881385a86bf887669a555ae03759c374ec9c50':
  [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
2014-07-07 21:19:45 +00:00
Craig Mautner
9d8a30d9e1 am a7f02a5c: am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."
* commit 'a7f02a5cda27147fe7076805187fb6fbc60fdcfb':
  [ActivityManager] Avoid keeping restarting home when only home activity exists.
2014-07-07 17:26:20 +00:00
Craig Mautner
a7f02a5cda am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."
* commit 'ef2e76675a6c60a2a4764a2e19fdb2c4d9beb00e':
  [ActivityManager] Avoid keeping restarting home when only home activity exists.
2014-07-07 17:23:06 +00:00
Craig Mautner
0a99270250 am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."
* commit '09c1af5d5c43f716fb4093eae6cf5442e7bb88d1':
  [ActivityManager] Prevent kill a restarted process again.
2014-07-07 15:41:55 +00:00
Craig Mautner
09c1af5d5c am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."
* commit 'c66da9d606fa3091540bc4c51c2904cc949bf777':
  [ActivityManager] Prevent kill a restarted process again.
2014-07-07 15:36:33 +00:00
Craig Mautner
53cc7d7998 am 7611a5d3: am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm."
* commit '7611a5d32889f54b1763cf076a442a0575c69b51':
  [ActivityManager] Ensure alive process is not killedByAm.
2014-07-07 15:06:41 +00:00
Craig Mautner
7611a5d328 am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm."
* commit '5acdd0f67db9b5f41a89dfb5200f37d6f5f984ec':
  [ActivityManager] Ensure alive process is not killedByAm.
2014-07-07 15:00:47 +00:00
Craig Mautner
c66da9d606 Merge "[ActivityManager] Prevent kill a restarted process again." 2014-07-06 03:24:06 +00:00
dcashman
3a0dbfb206 Record properSigningKeySet values to packages.xml
PackageKeySetData records all of the defined keysets which are a subset of an
apk's signing keyset.  It also records the original superset for all of these
in an easy-to-access 'proper' signing-keyset which is consulted as the official
source for a package.  This value was not being recorded, causing
PackageManager to re-gather the certificates for a package on each boot after
a fix for a different bug.  Record it.

Bug: 16076095
Change-Id: If5a7f6d70dd4784284d7bab466dab0311aa13c28
2014-07-07 14:09:37 -07:00
riddle_hsu
7f1e3f3e93 [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
Sympton:
When application crash in a special timing and system server's InputMethodManager is binding, deadlock may occur.

Root Cause:
Thread(1): When using InputMethodManager in system server, it will lock mH(handler) of InputMethodManager,
and sometimes it will call to InputMethodManagerService::showCurrentInputLocked and will call bindService at some condition,
then it will also lock ActivityManagerService.
Thread(2): When an application crashed, it will lock ActivityManager when showing crash dialog, inside the dialog,
it will call setEnabled of Button and lock mH of InputMethodManager.setEnable of TextView will lock IMM's handler.
So the deadlock happened as the flow: (2) lock AMS -> (1)lock mH -> (2)wait mH -> (1) wait AMS

Solution:
Reduce nested lock of error dialog: post message to let (2) lock mH after release AMS lock.

Change-Id: Id85c29406236db3b5fca9655fde1fcaf0afd1337
2014-07-08 04:30:19 +08:00
riddle_hsu
a4f1f8a239 [ActivityManager] Prevent kill a restarted process again.
Root Cause:
Use removeTask with flag ActivityManager.REMOVE_TASK_KILL_PROCESS will set waitingToKill = "remove task"
to the target process when its setSchedGroup is not BG_NONINTERACTIVE.
Later the target process may be killed when applying oom-adj due to setSchedGroup has changed to BG_NONINTERACTIVE.
If the process is needed to restart, the process record will be resued.
Then the restarted process may be killed again because its waitingToKill is not null.

Solution:
Clean waitingToKill when process is dead.

Change-Id: I5ffb5388127f4221da4c700d3f1c224f7ca6e7b2
2014-07-04 12:19:41 +08:00
riddle_hsu
abc69e93d6 [ActivityManager] Ensure alive process is not killedByAm.
Symptom: Unable to kill by Am again and will be skipped updating its oom adj.

Root Cause:
A restarted process will reuse original process record.
The flag killedByAm will keep previous state.

Solution:
Reset the flag killedByAm to false when the process is started.

Note: Found another similiar patch If95137d91939cc44882ad2813131bcde0edd0c1b


Change-Id: I59a86648ca8d0aed4c489d92751af120aae5ef90
2014-07-04 13:33:19 +00:00
Craig Mautner
ef2e76675a Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists." 2014-07-02 20:49:53 +00:00
riddle_hsu
3145b24902 [ActivityManager] Avoid keeping restarting home when only home activity exists.
Root Cause:
When there is only home activity existed,
updating home apk will call forceStopPackageLocked to finish the activity.
Then activity history becomes empty, then home will be launched,
but its package is still target to close that results a loop.

Solution:
If home activity has been force-stopped, do not stop the same home activity again.

Change-Id: Icff12028d407873c2e6f50a06bcad231b908ccbd
2014-07-04 17:01:56 +08:00
Mike Reed
f16c5e7ae0 Merge "kNative_8888_SkColorType is now kN32_SkColorType" 2014-07-02 20:00:08 +00:00
Mike Reed
4a9c3891d4 kNative_8888_SkColorType is now kN32_SkColorType
Change-Id: I13421a21de611203c62c1c1c36570a8cc803907b
2014-07-07 15:47:55 -04:00
Dianne Hackborn
6ea0d0a259 Fix cleanup of voice sessions.
They would leave active voice activities lingering around.

Change-Id: I5b6716ab303636ebdf2f13c3172552a73dae3bb1
2014-07-07 11:28:29 -07:00
Emily Bernier
92aa5a2f15 Re-commit of reverted change 458959
Using correct parameters for Slog.w().

Change-Id: I0ab7a1b114431f15fe3652e98c75e7baab7a2d95
2014-07-07 19:22:06 +00:00
Robert Greenwalt
620a5466ce Merge "Remove unused api." 2014-07-02 18:55:10 +00:00
Craig Mautner
0df9858802 am 9d8a30d9: am a7f02a5c: am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."
* commit '9d8a30d9e1c17877cd45686a8f6aa70142c33573':
  [ActivityManager] Avoid keeping restarting home when only home activity exists.
2014-07-07 17:33:32 +00:00
Jason Monk
a8f569c10a Add toast when user tries to leave lock-to-app
The toast will describe how to exit when entered normally, but when
entered by a DPM whitelisted app it will just notify them they are in
the mode.

Bug: 15780115
Change-Id: I75ac8540c31a75ac68e34b3b5c8260e191894b39
2014-07-07 17:13:34 +00:00
RoboErik
851d2d5d56 Don't send remote volume changes for local playback
bug: 15913248
Change-Id: I701d0a446ef981deae171b9e882c29906593b3c8
2014-07-07 16:55:14 +00:00
Paul Jensen
e585bfe80c When adding a NetworkRequest, cancel linger for satisfying Network.
This fixes a problem where a requested network can later suddenly disappear if
it was lingering when the request arrived and later the linger timeout expired.

bug:15927234
Change-Id: Ib3fae45820ce4421e3bc5b623937a16d5f1efa0f
2014-07-07 15:50:24 +00:00
Craig Mautner
b633657be4 am 0a992702: am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."
* commit '0a9927025041a6dde3f3878bdd868a69ab1b3266':
  [ActivityManager] Prevent kill a restarted process again.
2014-07-07 15:47:55 +00:00
Robert Greenwalt
17c3e0fbfc Remove unused api.
bug:15595155
Change-Id: Ifd79365bd45f20f531782244f471a4cfc32a4135
2014-07-02 13:50:33 -07:00
Alexandra Gherghina
539a7ef5c9 Removes cross profile package information when removing an user
This makes sure that if the user id gets reassigned without restarting the phone,
we do not have old information from the preexisting profile.

Also renames method which needs write locks.

Bug: 15928463
Change-Id: I30b0f85cf90d3e0c289a37bcbaec8da63499a170
2014-07-08 14:35:56 +01:00
Jeff Sharkey
56d69f01a7 Merge "Offer to scan cluster packages at boot." 2014-07-07 17:47:39 +00:00