12785 Commits

Author SHA1 Message Date
Craig Mautner
a729a34ae6 Merge "Convert mHistory to mTaskHistory (8)" 2013-03-04 19:28:57 +00:00
Craig Mautner
a0dbf0ec01 Merge "Convert mHistory to mTaskHistory (7)" 2013-03-04 19:24:34 +00:00
Michael Wright
7ca095f095 am 32440aa2: Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev
* commit '32440aa25d958c8b82e7c17f784defc0a5860c0a':
  Unify inputDispatchingTimedOut with keyDispatchingTimedOut
2013-03-01 22:25:50 +00:00
Michael Wright
32440aa25d Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev 2013-03-01 22:20:46 +00:00
Michael Wright
7dd5bb18d4 Unify inputDispatchingTimedOut with keyDispatchingTimedOut
Bug: 8194916
Change-Id: Iac40108d848bcca77f49a7a49c57a095b3dbe9c9
2013-03-01 14:14:35 -08:00
Satoshi Kataoka
24364451c3 Merge "Add a comment for secondary user handling in IMMS" 2013-03-01 02:34:11 +00:00
Craig Mautner
aab647ed57 Convert mHistory to mTaskHistory (8)
- Convert findTaskToMoveToFrontLocked from mHistory to mTaskHistory.
- Convert getTasksLocked from mHistory to mTaskHistory.
- Convert unhandledBackLock from mHistory to mTaskHistory.
- Convert dumpActivitiesLocked from mHistory to mTaskHistory.
- Convert getDumpActivitiesLocked from mHistory to mTaskHistory.
- Convert restartPackage from mHistory to mTaskHistory.

Change-Id: Ica654a964e91f6c6dae92e7fe326bc08b5ad36ac
2013-02-28 17:45:07 -08:00
Jeff Sharkey
6d248625d3 am 7f61d014: Merge "Allow loopback traffic in lockdown mode." into jb-mr2-dev
* commit '7f61d0146e48275bf372e6b1ea82d2f48163c73d':
  Allow loopback traffic in lockdown mode.
2013-03-01 01:03:27 +00:00
Jeff Sharkey
7f61d0146e Merge "Allow loopback traffic in lockdown mode." into jb-mr2-dev 2013-03-01 00:58:32 +00:00
Jeff Sharkey
812085bc70 Allow loopback traffic in lockdown mode.
Bug: 8245184
Change-Id: If993e3d6f5c7ce5970bfe701074c85b9245aa2aa
2013-02-28 16:57:58 -08:00
Craig Mautner
0247fc80c1 Convert mHistory to mTaskHistory (7)
- Remove TaskRecord from mTaskHistory and mTaskIdToTaskRecord when
last ActivityRecord is removed from it.
- Convert finishActivityLocked from mHistory to mTaskHistory.
- Convert navigateUpToLocked from mHistory to mTaskHistory.
- Convert removeHistoryRecordsForAppLocked from mHistory to
mTaskHistory.
- Convert moveHomeToFrontLocked from mHistory to mTaskHistory.

Change-Id: Ic632a8213f48dda1126c5e6853325a298b54f25f
2013-02-28 16:32:23 -08:00
Lorenzo Colitti
30929b758d am 51019a0f: Merge "Expose clatd commands to NetworkManagementService." into jb-mr2-dev
* commit '51019a0fc7135ecb7cc965a80c6e5d13ae23a701':
  Expose clatd commands to NetworkManagementService.
2013-03-01 00:21:39 +00:00
Svetoslav
e71384bcce am 2a45b9fe: Merge "Fake accessibility service used by UiAutomation not destroyed." into jb-mr2-dev
* commit '2a45b9fe99b10baeedb9c4529dcc5177ad7e3584':
  Fake accessibility service used by UiAutomation not destroyed.
2013-02-28 22:38:05 +00:00
Craig Mautner
9658b31509 Convert mHistory to mTaskHistory (6)
- Convert isInStackLocked from mHistory to mTaskHistory.
- Fix discrepancy between mHistory and mTaskHistory when all
activities in a task are finishing and a new one is being added.
mHistory was separating the task into two places in the stack,
mTaskHistory can't do that.
- Convert startActivityUncheckedLocked from mHistory to mTaskHistory.
- Convert finishTopRunningActivityLocked from mHistory to mTaskHistory.

Change-Id: I42b097c2f187d40ecd98b108794757063903218b
2013-02-28 12:32:11 -08:00
Craig Mautner
c458b7f8d3 Merge "Convert mHistory to mTaskHistory (5)" 2013-02-28 20:20:26 +00:00
Lorenzo Colitti
79751848d1 Expose clatd commands to NetworkManagementService.
For now, we only support running one clat at a time. This is
enforced by the netd ClatdController code.

Bug: 8276725
Change-Id: I8a50305f9182f4da0f80716081211625a0202583
2013-02-28 16:33:48 +09:00
Jim Miller
1430193df4 Merge "Add permission check to AccountManagerService to allow keyguard access." 2013-02-28 03:35:05 +00:00
Jim Miller
6a31d15efb Merge changes I254d6fc6,I360e9ac7
* changes:
  Move keyguard to its own process.
  Move keyguard source and resources into new package
2013-02-28 03:30:45 +00:00
Jim Miller
464f530978 Add permission check to AccountManagerService to allow keyguard access.
When keyguard gets moved to its own process, it will need to access
specific user accounts in order to enable features such as the "forgot pattern"
button.  This adds an additional check to allow apps with the
INTERACT_ACROSS_USERS_FULL permission to work.

Change-Id: Id3107bc212ae3005870db781c32ae4405c068ad9
2013-02-27 18:33:25 -08:00
Svetoslav
2a45b9fe99 Merge "Fake accessibility service used by UiAutomation not destroyed." into jb-mr2-dev 2013-02-28 02:33:05 +00:00
Svetoslav
3c55e5c659 Fake accessibility service used by UiAutomation not destroyed.
UiAutomation registers a fake accessibility service to introspect
the screen. Upon the death of the shell process that started an
instrumentation in which a UiAutomation resides the connection
between the UiAutomation and the system is kept alive allowing
the instrumentation to introspect the screen even after the death
of the shell process.

bug:8285905

Change-Id: I1a16d78abbea032116c4baed175cfc0d5dedbf0c
2013-02-27 18:32:17 -08:00
Jim Miller
5ecd81154f Move keyguard to its own process.
This is in preparation to moving keyguard into its own process.

Moved keyguard source and resources into new .apk.

Got basic test app working.  Still need to implement MockPatternUtils
and means to pass it into KeyguardService with local binder interface.

Added new ACCESS_KEYGUARD_SECURE_STORAGE permission.

Temporarily disabled USER_PRESENT broadcast.

Remove unintentional whitespace changes in PhoneWindowManager, etc.

Checkpoint basic working version.

Move to systemui process.

Synchronize with TOT.

Sync with recent user API changes.

Fix bug with returing interface instead of stub for IKeyguardResult.  Create KeyguardServiceDelegate to allow
for runtime-selectable local or remote interface.

More keyguard crash robustness.

Keyguard crash recovery working.  Currently fails safe (locked).

Fix selector view which was still using frameworks resources.

Remove more references to internal framework variables.  Use aliases for those we should move but
currently have dependencies.

Allow runtime switching between service and local mode.

Fix layout issue on tablets where orientation was reading the incorrect constant
from the framework.  Remove more framework dependencies.

Fix PIN keyboard input.

Remove unnecessary copy of orientation attrs.

Remove unused user selector widget and attempt to get multi user working again.

Fix multi-user avatar icon by grabbing it from UserManager rather than directly since
keyguard can no longer read it.

Merge with AppWidget userId changes in master.

Change-Id: I254d6fc6423ae40f6d7fef50aead4caa701e5ad2
2013-02-27 17:27:53 -08:00
Svetoslav
b9dec1c3a7 am a60fdfac: NPE in AccessibilityManagerService.
* commit 'a60fdfac9432972e520e8c53b3b0717b4c3a2973':
  NPE in AccessibilityManagerService.
2013-02-27 23:22:22 +00:00
Svetoslav
a60fdfac94 NPE in AccessibilityManagerService.
If an accessibility service is connected but already removed
from the list of connecting services we get a NPE since the
call to set the service connection is made over a null
remove interface. Note that service connection is asynchronous.

bug:8229877

Change-Id: I7b05f219dd0c1da6286ee4ec90b1ef310908545d
2013-02-26 19:25:01 -08:00
Craig Mautner
1603077067 Convert mHistory to mTaskHistory (5)
- Remove commented out resetTaskIfNeededLocked.
- Remove mHistory from performClearTaskLocked(int, ActivityRecord).
- Remove mHistory from performClearTaskAtIndexLocked.
- Remove mHistory from performClearTaskLocked(int).
- Remove mHistory from getTaskAccessInfoLocked.

Change-Id: I3616147f9e9befa297f244dc4fd5d7b1e97300b3
2013-02-26 16:05:47 -08:00
Craig Mautner
5e7accf3cf Merge "Convert mHistory to mTaskHistory (4)" 2013-02-27 00:04:51 +00:00
Craig Mautner
000f002891 Convert mHistory to mTaskHistory (4)
- Remove mHistory from getTaskForActivityLocked.
- Remove mHistory from findTaskLocked.
- Remove mHistory from findActivityLocked.
- Minimize mHistory usage in switchUserLocked.
- Remove mHistory from resumeTopActivityLocked.
- Remove mHistory from validateAppTokensLocked.

Change-Id: I0cc7cf2f1b5a66a1e3b3a9baff7712a3f2f0d5c4
2013-02-26 15:04:29 -08:00
Craig Mautner
fd56e1d743 Merge "Convert mHistory to mTaskHistory (3)" 2013-02-26 22:23:10 +00:00
Michael Wright
9990e67b8c am 173bb615: Merge "Move stack dump off of InputDispatcher thread" into jb-mr2-dev
* commit '173bb61544fb41a10398606766f2bdf079ee02fc':
  Move stack dump off of InputDispatcher thread
2013-02-26 22:21:38 +00:00
Craig Mautner
7e57c9441c Merge "Remove AppTokenIterator from DisplayContent." 2013-02-26 22:19:52 +00:00
Michael Wright
173bb61544 Merge "Move stack dump off of InputDispatcher thread" into jb-mr2-dev 2013-02-26 22:14:41 +00:00
Craig Mautner
d74f7d728f Convert mHistory to mTaskHistory (3)
- Remove mHistory from topRunningActivityLocked(IBinder).
- Remove mHistory from topRunningNonDelayedActivityLocked.
- Remove mHistory from topRunningActivityLocked(ActivityRecord).
- Remove indexOfTokenLocked and its uses in
requestFinishActivityLocked and finishActivityAffinityLocked.

Change-Id: I96b44f66486406b4006b7937360fd92e8dd73060
2013-02-26 13:46:27 -08:00
Craig Mautner
f81b908752 Remove AppTokenIterator from DisplayContent.
Simplify accessing successive AppWindowTokens from different
TaskLists.

Change-Id: Icf6265dd6c7953c9c770c97e1342f0f81256c017
2013-02-26 13:04:35 -08:00
Dianne Hackborn
91adc04591 am 305dbea8: Merge "App ops: adding operations for reading/writing clipboard." into jb-mr2-dev
* commit '305dbea8e39608b61810637944b6ffbbe6c07d2f':
  App ops: adding operations for reading/writing clipboard.
2013-02-26 18:20:55 +00:00
Dianne Hackborn
305dbea8e3 Merge "App ops: adding operations for reading/writing clipboard." into jb-mr2-dev 2013-02-26 18:16:22 +00:00
Irfan Sheriff
9fbdda42a2 Merge "Fix leak in WifiManager" into jb-mr2-dev 2013-02-26 17:04:58 +00:00
Irfan Sheriff
302b06de7e Fix leak in WifiManager
Avoid leaks from having a channel connection per manager instance

Bug: 8254124
Change-Id: I10de91d7e5a775bc14bbab245734717d3b2f90d5
2013-02-26 09:01:48 -08:00
Irfan Sheriff
a7a1a8ef88 Merge "Fix leak in WifiManager" 2013-02-26 17:00:56 +00:00
Irfan Sheriff
feca4e9fa6 Fix leak in WifiManager
Avoid leaks from having a channel connection per manager instance

Bug: 8254124
Change-Id: I2118ee1848aec9a8fb51a2ca8ee220152e4d1119
2013-02-25 18:17:40 -08:00
Dianne Hackborn
efcc1a23a1 App ops: adding operations for reading/writing clipboard.
Change-Id: Ic4cade153618fe86954754a3b3edde64a52a0a9c
2013-02-25 18:02:35 -08:00
Michael Wright
5633e23c22 Move stack dump off of InputDispatcher thread
Change-Id: I7250a0488c3e4c5dc159f4635a57e1e49aa8397a
2013-02-25 17:52:37 -08:00
Craig Mautner
2e5528c5e0 Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev 2013-02-26 01:08:28 +00:00
Craig Mautner
2ad920759b Revert ActivityManager changes for tasks. DO NOT MERGE
Keeping all activity=>task changes in master and removing them
from jb-mr2.

Revert "Update histories simultaneously."
Revert "Add null check to setAppGroupId."
Revert "Fix crashing bug in validator."
Revert "Switch topRunning* and moveTaskTo*"
Revert "Begin switch over to task based history."
Revert "Reset and reuse Iterators and don't new() one."
Revert "Remove AppWindowToken lists."
Revert "Fix build."
Revert "Remove unused App methods."
Revert "Stop using AppToken movement and start using Task."
Revert "Replace access to mAppTokens with AppTokenIterator"
Revert "Refactor setAppOpVisibility implementation."
Revert "Add AppWindowTokens to TaskList."
Revert "Make ActivityStack.mHistory private."
Revert "Migrate AppWindowToken lists into DisplayContent."

Change-Id: I5722c9a4956dccb52864207e2967690bc58e4ebb
2013-02-25 17:07:39 -08:00
Maggie Benthall
3316f30add am 40bbc3bb: Merge "Add location sharing toggle user restriction." into jb-mr2-dev
* commit '40bbc3bb9997c6e9ea9aae42edd6bb4430d70978':
  Add location sharing toggle user restriction.
2013-02-25 21:49:03 +00:00
Craig Mautner
bc8cbe5ce8 Merge "Convert mHistory to mTaskHistory (2)" 2013-02-25 21:46:16 +00:00
Maggie Benthall
40bbc3bb99 Merge "Add location sharing toggle user restriction." into jb-mr2-dev 2013-02-25 21:42:13 +00:00
Geremy Condra
61f542ab95 Merge "Added the KeySetManager." 2013-02-25 21:42:12 +00:00
Romain Guy
25e8804340 am eb9dddbf: Merge "Lookup permission groups by name" into jb-mr2-dev
* commit 'eb9dddbffb9f2d568d2222454c5dd7582efa819d':
  Lookup permission groups by name
2013-02-25 21:38:59 +00:00
Romain Guy
eb9dddbffb Merge "Lookup permission groups by name" into jb-mr2-dev 2013-02-25 21:35:29 +00:00
Romain Guy
01d159d88a Lookup permission groups by name
When a top-level permission group is specified, lookup the group id
by name instead of parsing the value as an integer. This matches
what we do when the group tag is a child of <permission/>.

Change-Id: I54954ae683cecdf72cf846f75383bf6ba862dc5b
2013-02-25 13:22:42 -08:00