Commit Graph

22479 Commits

Author SHA1 Message Date
Craig Mautner
10c40fc01d am a12ac54c: am 25596374: Merge "[ActivityManager] Prevent provider from been created twice."
* commit 'a12ac54cf69c0c8cfec6fa7c14176b714cae7107':
  [ActivityManager] Prevent provider from been created twice.
2014-12-01 05:27:00 +00:00
Craig Mautner
62404e15f9 am 6151b118: am 94ac906b: Merge "Fix pointer index out of range exception"
* commit '6151b118b663b0620fee4fb87d9d143c6fd050b8':
  Fix pointer index out of range exception
2014-12-01 05:26:53 +00:00
Craig Mautner
5a6c196259 am 11c67c92: am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"
* commit '11c67c92de3522a50b9994eb83e34c152902ad18':
  Reset killedByAm flag at attachApplicationLocked
2014-12-01 05:26:37 +00:00
Craig Mautner
2559637429 Merge "[ActivityManager] Prevent provider from been created twice." 2014-12-01 00:16:41 +00:00
Craig Mautner
94ac906b10 Merge "Fix pointer index out of range exception" 2014-12-01 00:13:28 +00:00
Craig Mautner
7db48ed036 Merge "Reset killedByAm flag at attachApplicationLocked" 2014-11-30 23:55:13 +00:00
Olawale Ogunwale
21aadfcf71 am f5860728: am 87c5f362: Merge "Fix bad exclude region in landscape"
* commit 'f586072861850ade660e11eafa799f96314ce475':
  Fix bad exclude region in landscape
2014-11-27 13:54:37 +00:00
Craig Mautner
205dc8f94c am 980ce4ba: am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue."
* commit '980ce4bad08f65e559c39e86e799389c6615297e':
  ANR caused by incorrect cleanup in BroadcastQueue.
2014-11-27 12:01:33 +00:00
Jeff Sharkey
1446c6c6f6 am d76737a7: am b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app""
* commit 'd76737a7325bdcd5010f26fd1626628f07070bb9':
  APK still has privileged flag after being moved from "/system/priv-app"
2014-11-27 12:01:18 +00:00
riddle_hsu
105add8d1a [ActivityManager] Prevent provider from been created twice.
Root Cause:
If a process which contains provider is starting but not
from accessing provider, e.g. service/activity/receiver,
its providers' will be created during handleBindApplication.
And before the process complete publish provider to
ActivityManagerService, if there is an access call to
process provider before the process completes publishing
providers to ActivityManagerService, then the providers
will be created again.


Solution:
Don't schedule install provider if the provider record
already exist and will be published later.

Change-Id: Ic200ceae042c014c86e7edee0acd013b513af334
2014-11-27 05:16:17 +00:00
tingna_sung
4f65ca0f76 Fix pointer index out of range exception
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.

Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-27 08:32:14 +08:00
Olawale Ogunwale
87c5f36210 Merge "Fix bad exclude region in landscape" 2014-11-26 23:13:59 +00:00
Kazuki Nakayama
609cb91c9c Reset killedByAm flag at attachApplicationLocked
ActivityManager reuses a process record object that killed
by him under some situation. That reused process record inherits
a killedByAm flag unexpectedly.
The killedByAm flag must be reset otherwise ActivityManager can't
judge the process can be killed or not.

Change-Id: If95137d91939cc44882ad2813131bcde0edd0c1b
2014-11-26 15:07:33 -08:00
Guobin Zhang
04d0bb6e93 ANR caused by incorrect cleanup in BroadcastQueue.
Two broadcasts could be sent to the same app simultaneously:
one foreground, one background. For example, LOCALE_CHANGED
and PACKAGE_CHANGED are delievered to com.android.vending
at the same time.
1. AMS started new vending process to handle LOCALE_CHANGED.
   And set app.curReceiver = LOCALE_CHANGED.
2. Before LOCALE_CHANGED is handled by vending process,
   PACKAGE_CHANGED was delievered to vending process too.
   AMS set app.curReceiver = PACKAGE_CHANGED. Bad!
3. Vending process finished handling LOCALE_CHANGED.
   AMS clear app.curReceiver = NULL. Bad!
   And Vending process  killed itself without handling
   PACKAGE_CHANGED.
4. AMS known vending process has died, but didn't know that
   BgBroadcastQueue was still waiting for finish message
   for PACKAGE_CHANGED.
At last, BgBroadcastQueue reported ANR for PACKAGE_CHANGED.

This patch adds protection before clearing app.curReceiver,
only set to NULL if the finishing receiver = app.curReceiver
So handleAppDied would know that PACKAGE_CHANGED was not
finished yet, it will abort the broadcast and continue.

Change-Id: Ic4f31b35e21823d4a3c27712391ecbede213a494
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
2014-11-26 13:23:30 -08:00
Jeff Sharkey
06e8c58e7c am cd5d46ff: am 293f0f38: Merge "package_info GID shouldn\'t have write." into lmp-mr1-dev
* commit 'cd5d46ff81ab652dc9dc9c28d607f536187f3bab':
  package_info GID shouldn't have write.
2014-11-26 20:02:29 +00:00
Jeff Sharkey
cd5d46ff81 am 293f0f38: Merge "package_info GID shouldn\'t have write." into lmp-mr1-dev
* commit '293f0f380b514658f63474b714053fda0e92569f':
  package_info GID shouldn't have write.
2014-11-26 19:41:31 +00:00
Jeff Sharkey
293f0f380b Merge "package_info GID shouldn't have write." into lmp-mr1-dev 2014-11-26 18:49:33 +00:00
Jeff Davidson
228e2c2627 am daa699ce: am 8c99018a: Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev
* commit 'daa699ce1dea7882ee7d9f7704a18ca619285a9b':
  Handle package changes in NetworkScoreService.
2014-11-26 18:44:55 +00:00
Paul Jensen
f19f90b229 am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev
* commit '58a493accfeafa13fd77a16e832c5ad72a4c9006':
  Don't let NetworkMonitor state stop user-initiated transitions.
2014-11-26 18:43:29 +00:00
Jinsuk Kim
e4d336eb95 am 3052fede: am 1c72ba8a: Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev
* commit '3052fede8860724a225b49c31ffbb0aa3fd4707b':
  CEC: Do not compare active input when updating
2014-11-26 18:43:12 +00:00
Dianne Hackborn
5f84109cae am b3cf1136: am 4298db73: Merge "Re-tune low memory killer params." into lmp-mr1-dev
* commit 'b3cf1136d0d03e82517bf887eef91ce26a7c23bb':
  Re-tune low memory killer params.
2014-11-26 18:42:02 +00:00
Jeff Sharkey
b802cd6767 Merge "APK still has privileged flag after being moved from "/system/priv-app"" 2014-11-26 18:35:11 +00:00
Craig Mautner
dae55017d8 am 1c48e302: am a7a99981: Merge "Fix Presentation window is removed on stack change"
* commit '1c48e3029b41efea764520fee32c9085d1162a24':
  Fix Presentation window is removed on stack change
2014-11-26 18:14:22 +00:00
Craig Mautner
b448862981 am f9819b01: am 17fc8574: Merge "Sync focus stack frame and layer with focus app."
* commit 'f9819b011983f974f481b83a7e80d00569968900':
  Sync focus stack frame and layer with focus app.
2014-11-26 18:14:15 +00:00
Craig Mautner
b64b1dc8a1 am 77f8112d: am aed35d6b: Merge "Not include fullscreen opaque window on screenshot"
* commit '77f8112d526b60ccdc099dd418c8955d47b5418d':
  Not include fullscreen opaque window on screenshot
2014-11-26 18:14:08 +00:00
Craig Mautner
b6dc3ff286 am 6c3548a9: am e7648472: Merge "Measure absolute value of pointer motion distance"
* commit '6c3548a961db7b07ae4bbca1dae0a1b9f12e525d':
  Measure absolute value of pointer motion distance
2014-11-26 18:14:02 +00:00
Craig Mautner
a7a999816f Merge "Fix Presentation window is removed on stack change" 2014-11-26 17:53:00 +00:00
Craig Mautner
17fc8574e5 Merge "Sync focus stack frame and layer with focus app." 2014-11-26 17:43:30 +00:00
Craig Mautner
aed35d6b57 Merge "Not include fullscreen opaque window on screenshot" 2014-11-26 17:37:37 +00:00
Craig Mautner
e76484721e Merge "Measure absolute value of pointer motion distance" 2014-11-26 17:26:47 +00:00
Jeff Davidson
daa699ce1d am 8c99018a: Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev
* commit '8c99018a98a66af968bc1dc372f2f2399308bc62':
  Handle package changes in NetworkScoreService.
2014-11-26 16:00:08 +00:00
Jeff Davidson
8c99018a98 Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev 2014-11-26 15:55:18 +00:00
Paul Jensen
58a493accf am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev
* commit 'be3736d38774210549deb2999bb226d83a29f1ee':
  Don't let NetworkMonitor state stop user-initiated transitions.
2014-11-26 12:08:47 +00:00
Paul Jensen
be3736d387 Merge "Don't let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 2014-11-26 12:05:01 +00:00
Paul Crowley
0d122e265c am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev
* commit 'ba94fd5e6c243c6256a1627a41aaab52a74747d6':
  Add flag for wiping factory reset protection data.
2014-11-26 12:02:37 +00:00
Amit Mahajan
65940c4ceb am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev
* commit '476520f744a950fc27d6ac466c301a909d92481a':
  Adding helper functions to retrieve settings that are stored per subId.
2014-11-26 12:02:28 +00:00
Robin Lee
a7ffed86fc am cc19e8b8: am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev
* commit 'cc19e8b85b223e8a4b36ce3342c28f250fb08f91':
  DevicePolicy: Don't warn about managed profile CAs
2014-11-26 12:02:06 +00:00
John Spurlock
a2decb0e4d am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev
* commit 'f74ae93cac3c78762fc87cdaa9edd6f86f2dbec8':
  VolumeZen: Introduce internal vs external ringer mode.
2014-11-26 12:01:35 +00:00
Narayan Kamath
c9269da26c am edda97c9: am fdbef408: Merge "Start MountService before performBootDexOpt"
* commit 'edda97c9ffc4fae08744e42fdbf60040e8f97b99':
  Start MountService before performBootDexOpt
2014-11-26 11:10:48 +00:00
Narayan Kamath
fdbef4081d Merge "Start MountService before performBootDexOpt" 2014-11-26 10:59:29 +00:00
Akira Numata
76bf60ead8 APK still has privileged flag after being moved from "/system/priv-app"
When an app is moved from "/system/priv-app" to another location
during OTA update, the privileged flag should be removed.

Change-Id: I7713382db34697f7b68283dbbbd25a1349cbecdb
2014-11-26 06:58:04 +00:00
Jinsuk Kim
3052fede88 am 1c72ba8a: Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev
* commit '1c72ba8ac3036e16a58cd1fd50c7cb01804e993e':
  CEC: Do not compare active input when updating
2014-11-26 06:02:36 +00:00
Jinsuk Kim
1c72ba8ac3 Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 2014-11-26 05:58:40 +00:00
tingna_sung
0735697c9d Fix Presentation window is removed on stack change
If an activity show a Presentation window and this activity is moved
to bottom or top, thus this Presentation window will be removed from
its display window list, and no chance to be added back into window
container; It will cause the incorrect state that Presentation window
is lost from secondary display window list(displayContent.mWindows),
but still exist in app token's window list(appWindowToken.allAppWindows);
Moreover, once this activity resume again, Presentation window is not
shown because it's lost.

In this way, don't remove non-target display app windows due to only
target(or called default) display windows are removed temporarily and
re-sorted then added back into window list later.

Change-Id: I8960ce191f6c662455cba5a0a5e6a1ff9ef03ae1
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-26 13:46:21 +08:00
tingna_sung
b31cced065 Sync focus stack frame and layer with focus app.
Update focus stack frame/layer when focus app is changed to avoid
focus stack/layer isn't updated synchronously with focus app, it's
due to performLayoutAndPlaceSurfacesLocked() is not necessarily
called on focus app change; it will cause sending mismatching 
TAP_OUTSIDE_STACK message if there is effectual incoming pointer
event, hence may also result in focus stack is changed again,
therefore erroneous focus app is set by ActivityManager at final.

Change-Id: Ia0ec9a543be887b51a3b29b3e62fdd471c15edf2
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-26 05:34:06 +00:00
tingna_sung
a901f57580 Not include fullscreen opaque window on screenshot
Extend the fullscreen meaning by adding opaque drawn check on
screenshot application; if there is a fullscreen window but not
opaque, we will continue finding behind windows; otherwise ending up
including behind windows. It's able to help avoiding capturing BLACK
screenshot bitmap.

Change-Id: I1c7e8f513c366688ea8001c3d0c799f3522f0ffd
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-26 04:11:34 +00:00
tingna_sung
f2ad1a442b Measure absolute value of pointer motion distance
If pointer is moving to the negative axis direction, pointer movement
distance will always less than pre-defined mMotionSlop, thus
TAP_OUTSIDE_STACK will have chance to be sent, will cause unnecessary
focus stack switch.

Change-Id: Ia4c066bebce250257c7361ef976907a0ca2c6461
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-26 11:28:39 +08:00
tingna_sung
5664546fc1 Fix bad exclude region in landscape
Update DisplayContent.mBaseDisplayRect when device orientation is
changed, it avoids to set incorrect initial value of
mTouchExcludeRegion, that will cause result of calculated
mTouchExcludeRegion becomes an incorrect strange region on
landscape orientation.

Change-Id: I993864653edc2852f91abed7891e6631b4bae15a
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-26 03:21:16 +00:00
Dianne Hackborn
b3cf1136d0 am 4298db73: Merge "Re-tune low memory killer params." into lmp-mr1-dev
* commit '4298db73cecf81cd896b0460c69dbaa727b22514':
  Re-tune low memory killer params.
2014-11-26 01:55:16 +00:00
Dianne Hackborn
4298db73ce Merge "Re-tune low memory killer params." into lmp-mr1-dev 2014-11-26 01:44:22 +00:00