19242 Commits

Author SHA1 Message Date
Sandeep Siddhartha
5e33fb057c Stop recognition when shutting down VIS
Bug: 16629417
Change-Id: I9c98d7e6d487d3eaff604df401c320f8554589f9
2014-08-01 18:18:08 -07:00
Sandeep Siddhartha
2c0273e50a Add a flag for multiple triggers with same recognition session
Also annotate the flags with @IntDef to make things clearer and safer

Add more debug logging

Revert to start/stop being synchronous since telephony and microphone will
need to be handled internally.

Bug: 16731586
Bug: 16514535
Bug: 16549061
Change-Id: I83695d52e9547269c95d443e4d921c9238b7401e
2014-08-01 17:46:27 -07:00
Jinsuk Kim
ea374d4467 am f54d7893: am 0ac8928e: Fix bugs in active source command handling in HdmiControl
* commit 'f54d789334f083694c01620941a330e714eafdfb':
  Fix bugs in active source command handling in HdmiControl
2014-08-01 13:51:21 +00:00
Jinsuk Kim
b25b7f8da8 am 9a82e363: am d1f48b1e: Merge "System API HdmiControlService.getActiveSource" into lmp-dev
* commit '9a82e36362ea4cd862eeb6aa8840167aae66fad9':
  System API HdmiControlService.getActiveSource
2014-08-01 13:51:04 +00:00
Jeff Sharkey
a8dbc8347c am cc2e3136: am 2e7a3cb7: Merge "Persist install sessions, more lifecycle." into lmp-dev
* commit 'cc2e3136c2b460e6b44d9594a532e52bdf6d77e5':
  Persist install sessions, more lifecycle.
2014-08-01 13:50:25 +00:00
Christopher Tate
e90ec06a42 am b9b2995a: am 4bc621b8: Attempt install-time restore even for no-agent apps
* commit 'b9b2995a20569a90c0ba8167dda8fc0226f1767a':
  Attempt install-time restore even for no-agent apps
2014-08-01 13:50:06 +00:00
Ye Wen
fa58ac09df Return fake URI for AppOps permission failure check
Change-Id: Ib7adcce0827a90a49e317a5434fb1abfa91a51d5
2014-08-01 09:13:02 -07:00
Sandeep Siddhartha
2c84800910 Merge "Add a flag for multiple triggers with same recognition session" into lmp-dev 2014-08-01 13:40:04 +00:00
Robin Lee
a0995ab821 Always show error dialog for other profiles
Apps running on another profile of the same user were previously
considered to be running in the background, so their error dialogs
would not show unless ANR_SHOW_BACKGROUND was set.

@bug 15665024

Change-Id: I7e559c6b7f8befc1553bc0ec06e89e5d7906d198
2014-08-01 11:03:26 +00:00
Ken Wakasa
eaf0f3d1fc resolved conflicts for merge of d13b8822 to lmp-dev-plus-aosp
Change-Id: I3f474f72ee12684cfda7b394d7aa659c7f456131
2014-08-01 14:55:58 +09:00
Jinsuk Kim
7c3a95633d Fix bugs in active source command handling in HdmiControl
- Make sure input change listener is invoked
- The command from new device at the active path should
  start routing control

Change-Id: Ic0ca52d42cc1738f9effced322b00f3bd1957f60
2014-08-01 03:43:54 +00:00
Craig Mautner
cc9537ce55 Call method while holding lock.
The method removeRecentTasksForUser() was being called without the
ActivityManagerService lock held. This change calles it while the
lock is held and renames it to indicate that it should be called
while holding the lock.

Fixes bug 16775111.

Change-Id: I002f9f96d407de458934da8bc728acd54f0c398c
2014-08-04 09:46:31 -07:00
Christopher Tate
73140e4df9 Attempt install-time restore even for no-agent apps
Packages without their own backup agents can still have restorable
data to be delivered.  Correct the logic for attempting a restore
at install time so that it no longer requires an app-defined backup
agent.

Bug 16688665

Change-Id: I7dcf7ef85ad6b5b393a2c97ce62f1b2eec9d3520
2014-07-31 21:41:12 +00:00
Torne (Richard Coles)
6a0d43f09d Fix WebViewUpdateService timeout code.
The loop was initialising the boolean incorrectly causing the first
iteration to wait even when the condition was already true and have to
hit the timeout before loading continues.

Change-Id: I6a347cff2e4560b38c8aec3297e456b6f784a97e
2014-08-01 18:40:20 +01:00
Ben Murdoch
798e7f5cce Merge changes I2f40be36,I4af9fd7e,Ib0b4245f,I55acad96,Id276b71e, ... into lmp-dev
* changes:
  Cherry pick Cleanup debug messages in WebViewFactory and WebViewUpdateService DO NOT MERGE
  Cherry pick Move startIsolatedProcess implementation in ActivityManagerService DO NOT MERGE
  CHerry pick Find WebView package name from a config resource. DO NOT MERGE
  Cherry pick Remove dependency on WebView native library path. DO NOT MERGE
  Cherry pick Make WebViewUpdateService a SystemService. DO NOT MERGE
  Cherry pick Refactor ActivityManagerService and make WebViewFactory more pedantic. DO NOT MERGE
  Cherry pick Refactor native library path logic in WebViewFactory DO NOT MERGE
  Cherry pick Append WebView assets to AssetManager when loading the WebView. DO NOT MERGE
  Cherry pick Introduce startIsolatedProcess private API in ActivityManager DO NOT MERGE
  Cherry pick Load the WebView Java code from an APK. DO NOT MERGE
2014-07-31 19:45:19 +00:00
Primiano Tucci
e76e81a227 Cherry pick Cleanup debug messages in WebViewFactory and WebViewUpdateService DO NOT MERGE
This is just a cleanup CL which fixes:
- Some erroneous debug messages about the relro creator process.
- The condition checked in WebViewUpdateService, to prevent the
  WebView to be used from the SystemServer (it now looks at the
  process id, previously it was erroneously looking at the uid).
- Adds a 5s. timeout to the waitForRelroCreationCompleted.

Original BUG:16403706

Original Change-Id: I43a953949050d7df5fe334cfa7257315ee6db071

Bug: 16723226
Change-Id: I2f40be3622b8e6c68b2b52cae7f4d3a95e148cbf
2014-08-01 14:25:26 +01:00
Primiano Tucci
994e219da8 Cherry pick Move startIsolatedProcess implementation in ActivityManagerService DO NOT MERGE
This CL addresses the comments in CL 512432, moving the implementation
of startIsolatedProcess in the outer ActivityManagerService class and
making the entry point in the ActivityManagerInternal sublcass just
a proxy method.
This change also addresses a potential NPE, due to startProcessLocked
returning null in some failure cases.

Original BUG:16403706
Original Change-Id: I21eff88c23221653f552cfc171647a839e42a802

Bug: 16723226
Change-Id: I4af9fd7eea10b11e06a5c37d8160c220376b3ed1
2014-08-01 14:25:18 +01:00
Ben Murdoch
5ced502fba Cherry pick Remove dependency on WebView native library path. DO NOT MERGE
This CL removes the final use of the hardcoded WebView
library path from WebViewFactory. We now use a system
property to set the amount of address space to reserve
in the zygote rather than stat'ing the file.

See also I07ad5a774623c1899eb50474d999a2b1447783f0

Original Change-Id: Id3c1e3cc2e2a06c1021ad0260a37abcd07d78fd6

Bug: 16723226
Change-Id: I55acad96b6d9ee69f14b84d772abf7740ea96b94
2014-08-01 14:24:58 +01:00
Torne (Richard Coles)
4dbeb359b2 Cherry pick Make WebViewUpdateService a SystemService. DO NOT MERGE
Migrate WebViewUpdateService to the newer SystemService approach instead
of ServiceManager.addService.

Original Bug: 16403706
Original Change-Id: I21aa67a41c22c3c20ba9e82eb87e5d610fe130e8

Bug: 16723226
Change-Id: Id276b71ee547e683f0756bcee0f4978ce342c2af
2014-08-01 14:24:47 +01:00
Primiano Tucci
161536b597 Cherry pick Refactor ActivityManagerService and make WebViewFactory more pedantic. DO NOT MERGE
This CL adds more robustness to the logic in WebViewFactory, checking
whether the isolated process did start at all and catching exceptions
in its java side.
Also, this addresses the refactor comments received in CL 509840.

Original BUG:16403706
Original Change-Id: Iaaea6d36142ece6d974c2438259edf421fce9f2e

Bug: 16723226
Change-Id: Id308f2ffde9b67a3eb4719c7b81b4f46421f0c2e
2014-08-01 14:24:38 +01:00
Primiano Tucci
810c052d9b Cherry pick Introduce startIsolatedProcess private API in ActivityManager DO NOT MERGE
The new API spawns a isolated process, using a custom uid, entrypoint and
abi. Such API is used by the WebViewFactory to spawn its unpriviledged
but trusted process (hence the fixed uid) which rewrites the rerlo file
on boot / when an update occurs.
Since both the ActivityManager service and the WebViewUpdate service
live in the SystemServer their calls be dispatched locally and no
binder interface needs to be exposed for the new startIsolatedProcess API.

Original BUG:16403706
Original Change-Id: I327b59735c12698595e0dbcc4da5d759c9103b0a

Bug: 16723226
Change-Id: Iecb49888e11eec9d302d9712953fd498db5821af
2014-08-01 14:24:09 +01:00
Eunae Kim
ad3aa32fee Fix a bug that the RecentTask list of other’s may show up to non-primary users.
Cherry-pick from aosp to lmp-dev.

When switching to a newly created user, the user may face this bug
when he opens the RecentTask screen.

A possible bug scenario is described as follows:
A user id of a removed user may be recycled when created a new user.
However, mRecentTasks is not correctly controlled so that old
information may still remain and be possibly mapped to wrong user.
This patch prevents this bug by explicitly removing old information
in mRecentTasks when removing existing user.

Change-Id: I1874dbd604598a5d740ae1e034981e21214c15c6
Signed-off-by: Eunae Kim <eunae.kim@lge.com>

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java
2014-07-31 10:27:28 -07:00
destradaa
95eb76b440 am 13fcdab4: am 7efb7d49: Fix crash in Volantis because there is not FLP support.
* commit '13fcdab467b42dc79652f2b082700c361c1f8002':
  Fix crash in Volantis because there is not FLP support.
2014-07-31 17:25:30 +00:00
riddle_hsu
214be42ea6 [ActivityManager] Prevent coredump file may not complete for testing.
Cherry-pick from aosp to lmp-dev

Sympton:
During testing, skip kill native crash process manually because it
will continue to die by default.

Root Cause:
Large process may take some time to do coredump.In auto test, crash
process will be killed immediately that results incomplete coredump
file.

Solution:
If the tester (IActivityController) will handle app crash event,
Do not kill native crashed process if the rom is debuggable.

Change-Id: Ia360af147d694125d440e5ba2f958c4759a50494

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java
2014-07-31 10:18:59 -07:00
destradaa
beea442e72 Fix crash in Volantis because there is not FLP support.
b/16690237

Change-Id: Ie2dd159ad4e9b5cf4b3e2e66023b456927f18130
2014-07-31 17:02:01 +00:00
Sandeep Siddhartha
a542651bf8 am 2120e854: am 9428457f: Merge "Don\'t unload sound model in start recognition unless the model changes" into lmp-dev
* commit '2120e8549f15fd7100d2b0cc2d2da79ee7f076b1':
  Don't unload sound model in start recognition unless the model changes
2014-07-31 16:51:18 +00:00
Craig Mautner
48e436cd1f am b442d922: am 4895bf78: Merge "Fix a bug that the RecentTask list of other’s may show up to non-primary users."
* commit 'b442d922a213509439dede33a1904f9da5fc244b':
  Fix a bug that the RecentTask list of other’s may show up to non-primary users.
2014-07-31 16:16:10 +00:00
Craig Mautner
b442d922a2 am 4895bf78: Merge "Fix a bug that the RecentTask list of other’s may show up to non-primary users."
* commit '4895bf78ffd44ba076e4bc9805e43ce834f84b1e':
  Fix a bug that the RecentTask list of other’s may show up to non-primary users.
2014-07-31 16:08:50 +00:00
Christoph Studer
f0c233a5d9 am 2edbe5ac: am dd63df29: Merge "NoMan: Use Notification.isGroupX() methods" into lmp-dev
* commit '2edbe5acad11815d322e16b682d4112f35ad4ce0':
  NoMan: Use Notification.isGroupX() methods
2014-07-31 15:31:24 +00:00
Christoph Studer
e14e232fff am d06301eb: am cab1943e: Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev
* commit 'd06301eb08300d7f9b25c4167eb3b45d2bfbeecb':
  NoMan: Filter group children for pre-L listeners
2014-07-31 14:28:51 +00:00
Lorenzo Colitti
e0949acafb am 0acef547: am 35474389: Merge "Add logging of Legacy Type info." into lmp-dev
* commit '0acef5477e6eee29fc61153d9c6ca2caa50252cd':
  Add logging of Legacy Type info.
2014-07-31 14:28:40 +00:00
Sander Alewijnse
f0cb383bad am 1d7e62b7: am 9d032110: Fix deadlock window manager and device policy manager.
* commit '1d7e62b7b77fb5184feb6676669b0d2544baecd0':
  Fix deadlock window manager and device policy manager.
2014-07-31 13:28:34 +00:00
Jae Seo
1e7100a6e6 am 6d682881: am b3e54101: TIF: Make TvTrackInfo methods more explicit.
* commit '6d682881c2692c3566e1ab12727f7432aa8eca5e':
  TIF: Make TvTrackInfo methods more explicit.
2014-07-31 13:28:30 +00:00
Wonsik Kim
ac5e7245b7 am b5c60c46: am 4092e720: Merge "TIF: fix TvInputHal bug for multiple devices" into lmp-dev
* commit 'b5c60c467ef0dfcab27b5aa9169c37a467fe603b':
  TIF: fix TvInputHal bug for multiple devices
2014-07-31 13:28:16 +00:00
Sander Alewijnse
a87863a8bd Fix deadlock window manager and device policy manager.
Removed all communication from wm to device policy manager.
Added initialization of cache in wm by dpms.

Change-Id: Ifa0b8bfcd625464b156d5cc0fb66d342deda1c27
2014-07-31 09:16:46 +00:00
Jae Seo
d5ce975952 TIF: Make TvTrackInfo methods more explicit.
This change addresses the following API council feedback:

TvTrackInfo:
-- Remove all KEY_/VALUE_ constants, and replace with explicit,
   strongly-typed accessor methods.
-- Add additional Bundle getExtras() method (in addition to the explicit
   types); most of the time this Bundle will be null.

Bug: 16542165
Change-Id: Ie48cb170b2bbf07d9460fdc8ed77d7db01799772
2014-07-31 16:15:51 +09:00
Craig Mautner
532f732838 resolved conflicts for merge of 5c4b5ede to lmp-dev-plus-aosp
Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java

Change-Id: Id6ece6daa4a36dc8479f5bce867cce3b42b3ef70
2014-07-30 22:37:11 -07:00
Craig Mautner
5c4b5eded6 am 6a58309e: Merge "[ActivityManager] Prevent coredump file may not complete for testing."
* commit '6a58309e734086a21580dd8d9175ac1817ca3ab2':
  [ActivityManager] Prevent coredump file may not complete for testing.
2014-07-31 04:01:35 +00:00
Craig Mautner
689e275292 am f37034ac: am 905fe15e: Merge "[ActivityManager] Avoid mistaking visibility by finishing task."
* commit 'f37034aca6e04d170a3abd2e9b19dcfd711c4e82':
  [ActivityManager] Avoid mistaking visibility by finishing task.
2014-07-31 04:00:56 +00:00
Craig Mautner
f37034aca6 am 905fe15e: Merge "[ActivityManager] Avoid mistaking visibility by finishing task."
* commit '905fe15ea09238ed132ccd347e078892b6b49ddf':
  [ActivityManager] Avoid mistaking visibility by finishing task.
2014-07-31 03:57:33 +00:00
Yuncheol Heo
4b54271f1b Don't clear local device when it goes to the standby mode.
Some OEM/SOC will keep passing the received packets until the
application processor goes to the sleep mode actually.  so we'll
not clear the local devices to get the received packets and react
like in the standby mode.

Bug: 16661406
Change-Id: I6eb9c21877a29905bb0084256dc6692fe0d07170
2014-07-31 10:31:15 +09:00
riddle_hsu
9bcc6e83d9 [ActivityManager] Avoid mistaking visibility by finishing task.
Cherry-picked from aosp into lmp-dev.

Sympton:
Next activity only adds to history but does not launch/resume then results ANR.

Root Cause:
In a rare timing, some windows are switched at the same time,
it will cause some finishing records on the top temporarily,
then set startIt to false that skip to resume the real top activty.

Solution:
If all activities in a task are finishing, do not use it to check.
The behavior/checking is the same concept as in JellyBean:
            // If starting in an existing task, find where that is...
            boolean startIt = true;
            for (int i = NH-1; i >= 0; i--) {
                ActivityRecord p = mHistory.get(i);
                if (p.finishing) { // <--
                    continue;
                }

Change-Id: I9d81a7b5182400c52e173da23eee61c74692beee

Conflicts:
	services/java/com/android/server/am/ActivityStack.java
2014-07-31 17:07:39 +00:00
riddle_hsu
8062b9534f [ActivityManager] Prevent coredump file may not complete for testing.
Sympton:
During testing, skip kill native crash process manually because it will continue to die by default.

Root Cause:
Large process may take some time to do coredump.In auto test, crash process will be killed immediately that results incomplete coredump file.

Solution:
If the tester (IActivityController) will handle app crash event,
Do not kill native crashed process if the rom is debuggable.

Change-Id: Ia360af147d694125d440e5ba2f958c4759a50494
2014-07-31 03:53:04 +00:00
riddle_hsu
1df4d9f8c7 [ActivityManager] Avoid mistaking visibility by finishing task.
Sympton:
Next activity only adds to history but does not launch/resume then results ANR.

Root Cause:
In a rare timing, some windows are switched at the same time,
it will cause some finishing records on the top temporarily,
then set startIt to false that skip to resume the real top activty.

Solution:
If all activities in a task are finishing, do not use it to check.
The behavior/checking is the same concept as in JellyBean:
            // If starting in an existing task, find where that is...
            boolean startIt = true;
            for (int i = NH-1; i >= 0; i--) {
                ActivityRecord p = mHistory.get(i);
                if (p.finishing) { // <--
                    continue;
                }

Change-Id: I9d81a7b5182400c52e173da23eee61c74692beee
2014-07-31 00:26:51 +08:00
Eunae Kim
26ac40305a Fix a bug that the RecentTask list of other’s may show up to non-primary users.
When switching to a newly created user, the user may face this bug when he opens the RecentTask screen.
A possible bug scenario is described as follows:
A user id of a removed user may be recycled when created a new user.
However, mRecentTasks is not correctly controlled so that old information may still remain and be possibly mapped to wrong user.
This patch prevents this bug by explicitly removing old information in mRecentTasks when removing existing user.

Change-Id: I1874dbd604598a5d740ae1e034981e21214c15c6
Signed-off-by: Eunae Kim <eunae.kim@lge.com>
2014-07-31 13:58:53 +09:00
Christoph Studer
3f31f5db65 NoMan: Use Notification.isGroupX() methods
Change-Id: I041f449361959440a5be7375e655a31fd14e7862
2014-07-31 16:55:32 +02:00
Christoph Studer
5e8cb22e60 Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev 2014-07-25 23:01:28 +00:00
Christoph Studer
cef37cf5c7 NoMan: Filter group children for pre-L listeners
Bug: 16189575
Change-Id: I5297b5273ab0aaee599981738eb736a49f21ce53
2014-07-30 22:37:21 +02:00
destradaa
f9a274c9b8 Add support for sources in Geofencing APIs.
Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
2014-07-30 23:35:08 +00:00
keunyoung
fa75e3d465 Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 2014-07-29 21:36:00 +00:00