10882 Commits

Author SHA1 Message Date
Nick Kralevich
cfa35cbc0c am b590b80e: am bb7ba4ae: Merge "grantPermissionsLPw: introduce doSignaturePermission" into jb-mr2-dev
* commit 'b590b80e36fd8e54c4d48f0c17af8709cbcf174d':
  grantPermissionsLPw: introduce doSignaturePermission
2013-04-02 12:48:03 -07:00
Nick Kralevich
b590b80e36 am bb7ba4ae: Merge "grantPermissionsLPw: introduce doSignaturePermission" into jb-mr2-dev
* commit 'bb7ba4ae67e486166547865b56efbd99e51f039a':
  grantPermissionsLPw: introduce doSignaturePermission
2013-04-02 12:44:40 -07:00
Nick Kralevich
bb7ba4ae67 Merge "grantPermissionsLPw: introduce doSignaturePermission" into jb-mr2-dev 2013-04-02 19:40:23 +00:00
Dianne Hackborn
a05a368613 am 69fe4069: am 006c6338: Merge "Fix bug in initializing preferred activities." into jb-mr2-dev
* commit '69fe40692973bf480019d71dea85d01d24eb7a68':
  Fix bug in initializing preferred activities.
2013-04-02 12:11:54 -07:00
Dianne Hackborn
69fe406929 am 006c6338: Merge "Fix bug in initializing preferred activities." into jb-mr2-dev
* commit '006c633896e6738297e7bc96128c56b03fbf8d01':
  Fix bug in initializing preferred activities.
2013-04-02 12:09:13 -07:00
Mita Yun
af210f6d27 am 4b808adc: am ed181586: Merge "Fixed a NPE in AccountManagerService" into jb-mr2-dev
* commit '4b808adc44b8d5f1538eff40e5b685c14154b948':
  Fixed a NPE in AccountManagerService
2013-04-02 12:08:10 -07:00
Mita Yun
4b808adc44 am ed181586: Merge "Fixed a NPE in AccountManagerService" into jb-mr2-dev
* commit 'ed181586a7ef0229edb27ba33d087d199ec81d53':
  Fixed a NPE in AccountManagerService
2013-04-02 12:05:32 -07:00
Dianne Hackborn
006c633896 Merge "Fix bug in initializing preferred activities." into jb-mr2-dev 2013-04-02 19:01:18 +00:00
Mita Yun
f4c240e68a Fixed a NPE in AccountManagerService
Bug: 8518620
Change-Id: Idf9b5864896ec57c63e3987fc01c73a5c983b5e2
2013-04-02 11:32:27 -07:00
Craig Mautner
08426453f3 am 79b468dc: Merge "Fix potential deadlock between LockScreen and WindowManagerService" into jb-mr2-dev-plus-aosp
* commit '79b468dcaab89f52394132d5ee733c6a01bad7e9':
  Fix potential deadlock between LockScreen and WindowManagerService
2013-04-02 11:04:37 -07:00
Kenny Root
232b4d60a6 resolved conflicts for merge of c16da6aa to master
Change-Id: Ibaaf2995def15573609562162902b3d73dd78ec0
2013-04-02 10:57:10 -07:00
Sangkyu Lee
0438bd692b Fix potential deadlock between LockScreen and WindowManagerService
If LockScreen is enhanced using SurfaceView/GLSurfaceView,
deadlock problem between LockScreen and WindowManagerService
can occur because of IWindow.resized() callback.
And it must lead to watchdog and reset.

IWindow.resized() callback is one-way function so calling resized()
callback of a remote IWindow object is never blocked.
However, calling resized() callback of a local IWindow object
(LockScreen is running on the same system_server process)
is always blocked until resized() callback returns.
Because resized() callback of SurfaceView/GLSurfaceView can lead to
WindowManagerService.relayoutWindow() call, deadlock can occur
between relayoutWindow() and performLayoutAndPlaceSurfacesLockedInner().
(Both functions need locking mWindowMap)

So this patch simulate one-way call when calling resized() callback
of a local IWindow object.

Change-Id: I2a6a5c74ed22d8e6b7a3bea3424ff2879d227105
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>

Conflicts:
	services/java/com/android/server/wm/WindowManagerService.java
2013-04-02 10:28:13 -07:00
Nick Kralevich
35bee33d6f grantPermissionsLPw: introduce doSignaturePermission
Make grantPermissionsLPw smaller by introducing a new doSignaturePermission
function.

Just a refactoring. No functional code changes.

Change-Id: Ia967fd93e3f7cf3e48fcd13be0b04994b76d36f3
2013-04-02 09:38:00 -07:00
Craig Mautner
e79d4268c0 Yet more movement from ActivityStack to Supervisor
- Remove redundant synchronize in ActivityStack.activityIdleInternal().
- Move startSpecificActivityLocked from ActivityStack to Supervisor.
- Move handleAppDiedLocked from Supervisor to ActivityStack.

Change-Id: Id746ab3bdff861b61182282bea1deb8fcf284084
2013-04-01 19:01:53 -07:00
Dianne Hackborn
4d491a605e Fix bug in initializing preferred activities.
Now that we are smarter about the initialization, we need
to do this after all packages are scanned.

Change-Id: I598f5ef84dcc83779bbff29e4c92136c63fb32de
2013-04-01 18:10:51 -07:00
Craig Mautner
2420ead032 More movement from ActivityStack to Supervisor
- Move showAskCompatModeDialogLocked from ActivityStack to
ActivityManagerService.
- Keep track of userId in ActivityStackSupervisor and initialize
new ActivityStacks with it.
- Move realStartActivityLocked to ActivityStackSupervisor except
for the part that actually updates the ActivityStack.

Change-Id: I7467302f1249fee2ea3cf027a49e0894c9a2213d
2013-04-01 17:31:37 -07:00
Craig Mautner
b0f7dc7588 Move performClearTaskLocked into TaskRecord.
Make TaskRecord responsible for clearing itself.

Change-Id: I03fa50aaec108ab7f071412785da59ad58243d87
2013-04-01 16:34:45 -07:00
Craig Mautner
23ac33bb85 Migrate activity starts into ActivityStackSupervisor.
Individual ActivityStacks should not be the place where stack
decisions are made.

Change-Id: If9c7a10e1127618c3ae008a0fea6e5943f776be4
2013-04-01 16:27:10 -07:00
Christopher Tate
73882cf489 Merge "debuggerd now notifies the Activity Manager about native crashes" into jb-mr2-dev 2013-04-01 21:22:27 +00:00
Craig Mautner
20e7227454 Remove mFocusedStack from ActivityManagerService.
Use ActivityStackSupervisor.mMainStack in its place. Or, in cases
where multiple stacks must replace mFocusedStack, create new
methods in ActivityStackSupervisor that will replace it.

Change-Id: Ib0dda51e1043a6d5110e5a2914d695ef16bf9371
2013-04-01 13:57:18 -07:00
Christopher Tate
58d380d2af debuggerd now notifies the Activity Manager about native crashes
The Activity Manager sets up a permission-guarded domain socket, which
debuggerd connects to when a crash happens.  If this is successful,
the daemon then mirrors the logged crash report to that socket, then
closes it.

The Activity Manager parses the native crash dump supplied by debuggerd
and forwards it to the standard app-crashed code.  The UX result is
that users now see the normal "app has stopped unexpectedly" dialog
with "report" and "okay" options for native crashes, not just for
DVM-mediated crashes.

Bug 8322568

Change-Id: Ie1b279896c603bd74d82d6cfcfd66a8f231da134
2013-04-01 13:50:23 -07:00
Craig Mautner
e11f2b774b Minor refactors
- Eliminate unused mLooper.
- Rename isSleeping to isSleepingOrShuttingDown.
- Fix dump formats.

Change-Id: I4cfc99605ac34213bf9b705562f2c701810434fd
2013-04-01 13:06:11 -07:00
Craig Mautner
5496140428 Merge "Move mStacks to ActivityStackSupervisor" 2013-04-01 16:11:05 +00:00
Amith Yamasani
18c8558a4b am 30cfaf7c: am 63fba8c1: Merge "Add new primary accounts to secondary limited users" into jb-mr2-dev
* commit '30cfaf7c863cf33dbfa6c7f9681997735fe62d40':
  Add new primary accounts to secondary limited users
2013-03-31 17:55:27 -07:00
Amith Yamasani
5be347bc52 Add new primary accounts to secondary limited users
When a new account is added to the primary, those will be marked
as shared accounts for secondary limited users. If the secondary user
is currently running, clone the account right away.

Bug: 8510431
Change-Id: Ie8ad87a7205e7b1a5a1752e75fbbfc416b2a58a7
2013-03-31 17:44:31 -07:00
Amith Yamasani
bb49e8573e resolved conflicts for merge of 15935aad to master
Change-Id: I9664186a62cf7b11844c6a14967f5b8c2b67c289
2013-03-30 19:26:37 -07:00
Amith Yamasani
42bc734b30 Merge "Block access to accounts for limited users." into jb-mr2-dev 2013-03-31 01:32:39 +00:00
Amith Yamasani
27db46850b Block access to accounts for limited users.
Make sure that apps that have access to restricted accounts can see them.
If they don't have access, they shouldn't be able to add a new account either.
Show an error message in the account picker if the user/app is not authorized.

Change-Id: I117c0b14d7d06c5ac4e66506df156b174567f5f3
2013-03-30 18:25:49 -07:00
Geremy Condra
cac0e0b11b Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev 2013-03-30 22:08:20 +00:00
Amith Yamasani
8d01846130 am 5c98b904: am 9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev
* commit '5c98b9046506cc69b261dd6ac2ae39b2de0afacb':
  Improve RestrictionEntry API
2013-03-29 18:52:58 -07:00
Amith Yamasani
9e8ba8f273 Merge "Improve RestrictionEntry API" into jb-mr2-dev 2013-03-30 01:47:33 +00:00
Amith Yamasani
86118baa4f Improve RestrictionEntry API
More getters and setters, better naming.
New extra defined for returning a custom intent that handles showing the
   restrictions UI.

Change-Id: I2ee0cdb4edd99e71a9004ff5e929dbe243b45557
2013-03-29 17:28:47 -07:00
Geremy Condra
77118fb55e Add SELinux updater and Settings-based enforcement switch.
Bug: 8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
2013-03-29 16:52:56 -07:00
Geremy Condra
4e7f7e839e Add SELinux updater and Settings-based enforcement switch.
Bug: 8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
2013-03-29 15:48:15 -07:00
Jatin Lodhia
278700fdb9 am 98c762bf: am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev
* commit '98c762bf7cd291e4ae3d9923a8feb3389855ecff':
  AccountManager changes for profile seeding.
2013-03-29 14:36:14 -07:00
Jatin Lodhia
ce66fd7479 Merge "AccountManager changes for profile seeding." into jb-mr2-dev 2013-03-29 20:44:49 +00:00
Lorenzo Colitti
4d25dd94aa am 742056ee: am 2fb669e6: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev
* commit '742056ee37e94cd51390527fea835112b29c8a94':
  Stop clat if it's no longer in use.
2013-03-28 18:25:52 -07:00
Lorenzo Colitti
2fb669e68f Merge "Stop clat if it's no longer in use." into jb-mr2-dev 2013-03-29 01:17:45 +00:00
Geremy Condra
3868a19759 am a54e0643: am 9d034deb: am 24948d3c: am 946a5c91: Merge "Save off the seinfo value with packages.list."
* commit 'a54e064365706d40c55c2984cca1f15a6bf3e8fb':
  Save off the seinfo value with packages.list.
2013-03-28 16:58:51 -07:00
Geremy Condra
9d034debdd am 24948d3c: am 946a5c91: Merge "Save off the seinfo value with packages.list."
* commit '24948d3ca7ff7fa70ee85e9aa7530239d7b482b2':
  Save off the seinfo value with packages.list.
2013-03-28 16:55:03 -07:00
Matthew Xie
3f9560261f am e4eb23ec: am 84e594f7: Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev
* commit 'e4eb23ecc232c508974976844df2ea8c44025fe9':
  Unhide Bluetooth Low Energy public APIs
2013-03-28 16:10:03 -07:00
Matthew Xie
84e594f7db Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev 2013-03-28 23:04:48 +00:00
Matthew Xie
ddf7e4756c Unhide Bluetooth Low Energy public APIs
Updated API headers. Add BluetoothManager to be retrieved by
context.getSystemService(Context.BLUETOOTH_SERVICE).
LE scan functions are placed in BluetoothAdapter
The GATT API are device driven instead of a profile-driver.
bug 8450158

Change-Id: I424a4cedaac3ef8120a05996500008dd210d2553
2013-03-28 15:36:10 -07:00
Geremy Condra
946a5c91d9 Merge "Save off the seinfo value with packages.list." 2013-03-28 21:45:22 +00:00
Elliott Hughes
d1e0f941d5 am 0f3a3777: am 94eaab4a: am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]"
* commit '0f3a3777026c20011f1b419daf12980715e594ff':
  Correct executable bit for source files [Take 2]
2013-03-28 14:32:59 -07:00
Geremy Condra
565dd2c469 am 0314b976: am 5c3bd37a: am f21a34bf: am 2ff853da: Merge "Add data validation on seinfo labels."
* commit '0314b976654ac9f64f8bb60962b81feadcc13d20':
  Add data validation on seinfo labels.
2013-03-28 14:32:56 -07:00
Elliott Hughes
94eaab4a5d am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]"
* commit '3ae30483777708ff3a4f59a4fa75c6a76213cc30':
  Correct executable bit for source files [Take 2]
2013-03-28 14:29:21 -07:00
Geremy Condra
5c3bd37ab7 am f21a34bf: am 2ff853da: Merge "Add data validation on seinfo labels."
* commit 'f21a34bf1b188cd662f6a08f5c709f4f641b1494':
  Add data validation on seinfo labels.
2013-03-28 14:29:17 -07:00
Elliott Hughes
a19647d3d8 Merge "Correct executable bit for source files [Take 2]" 2013-03-28 20:50:34 +00:00
Jatin Lodhia
3df7d697ca AccountManager changes for profile seeding.
Add a new error code to AccountManager and remove the check for
limited user during add account to allow Authenticators to seed
account during limited profile startup.

Change-Id: I5a73def9fc3baeb8e6de1b42e923829c335e1668
2013-03-28 13:46:58 -07:00