Commit Graph

159058 Commits

Author SHA1 Message Date
Craig Mautner
be342ef034 am c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released."
* commit 'c4cf78f4d3154af317e686c9ef702a26cf28f8f2':
  [ActivityManager] Ensure provider external access count will be released.
2014-12-01 00:26:11 +00:00
Craig Mautner
a12ac54cf6 am 25596374: Merge "[ActivityManager] Prevent provider from been created twice."
* commit '255963742982daf46eb665a2934bd61e7ed95c81':
  [ActivityManager] Prevent provider from been created twice.
2014-12-01 00:22:10 +00:00
Craig Mautner
c4cf78f4d3 Merge "[ActivityManager] Ensure provider external access count will be released." 2014-12-01 00:20:33 +00:00
Craig Mautner
6151b118b6 am 94ac906b: Merge "Fix pointer index out of range exception"
* commit '94ac906b103b0f03eca2000815bf306209f33109':
  Fix pointer index out of range exception
2014-12-01 00:16:57 +00:00
Craig Mautner
fac5568214 am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"
* commit '208bd91b2467dd5d4c41d5ada5c2bfa15c1b48c4':
  [ActivityManager] Avoid system server crash due to package removed
2014-12-01 00:16:52 +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
208bd91b24 Merge "[ActivityManager] Avoid system server crash due to package removed" 2014-12-01 00:11:52 +00:00
Craig Mautner
11c67c92de am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"
* commit '7db48ed03623834f7b8b420c83ab7916f6b39a8a':
  Reset killedByAm flag at attachApplicationLocked
2014-11-30 23:59:46 +00:00
Craig Mautner
082c0540e9 am 728e6c6c: Merge "Prevent showing immersive confirmation unexpectedly"
* commit '728e6c6c1789a1ae141bd0ecc21e8d9dca8dadcc':
  Prevent showing immersive confirmation unexpectedly
2014-11-30 23:59:40 +00:00
Craig Mautner
7db48ed036 Merge "Reset killedByAm flag at attachApplicationLocked" 2014-11-30 23:55:13 +00:00
Craig Mautner
728e6c6c17 Merge "Prevent showing immersive confirmation unexpectedly" 2014-11-30 23:54:43 +00:00
Elliott Hughes
3afb9f6378 am 2c53d22b: Merge "Mention ProGuard in the JNI documentation."
* commit '2c53d22bcc00838125cd70e17915da6ded5d0aca':
  Mention ProGuard in the JNI documentation.
2014-11-27 18:07:00 +00:00
Elliott Hughes
2c53d22bcc Merge "Mention ProGuard in the JNI documentation." 2014-11-27 18:01:34 +00:00
Narayan Kamath
ed2c9c6029 am 10a36fb7: Merge "Stop using ErrorStrings for apache."
* commit '10a36fb749d05bd90fc8ef3114562cacb631c07c':
  Stop using ErrorStrings for apache.
2014-11-27 17:58:21 +00:00
Narayan Kamath
10a36fb749 Merge "Stop using ErrorStrings for apache." 2014-11-27 17:53:04 +00:00
Narayan Kamath
f1a9b1bc24 Stop using ErrorStrings for apache.
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.

(congrats webview people, this is now your mess to maintain.)

Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
2014-11-27 17:23:41 +00:00
Narayan Kamath
bedb13782a am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class."
* commit '8036d2ec739636c1913a417cace97a5027d0270d':
  Delete general sounding "CharArrayBuffers" class.
2014-11-27 14:03:57 +00:00
Narayan Kamath
8036d2ec73 Merge "Delete general sounding "CharArrayBuffers" class." 2014-11-27 13:57:27 +00:00
Narayan Kamath
0ea4e7b581 Delete general sounding "CharArrayBuffers" class.
Move the code to the only point of use. Preparatory work for
decoupling apache-http from the frameworks.

Change-Id: Ieee54bb725cbac19d0c7513867635df6fbcf2b49
2014-11-27 13:52:11 +00:00
Narayan Kamath
f0c22b0c72 am 14e28134: Merge "Delete unused class from android.net.http."
* commit '14e28134c445435d71ed754e6be5867655d1dda3':
  Delete unused class from android.net.http.
2014-11-27 13:03:34 +00:00
Narayan Kamath
14e28134c4 Merge "Delete unused class from android.net.http." 2014-11-27 12:58:33 +00:00
Narayan Kamath
3ec2def9a3 Delete unused class from android.net.http.
Foundation for moving a lot of these classes out of the frameworks
and @removing these APIs.

Change-Id: I590cdd2867b923533de189ec956b4dd3f82efa46
2014-11-27 12:52:48 +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
f586072861 am 87c5f362: Merge "Fix bad exclude region in landscape"
* commit '87c5f3621037eda3c4d141e5681d4acbbaa13944':
  Fix bad exclude region in landscape
2014-11-26 23:20:30 +00: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
Craig Mautner
980ce4bad0 am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue."
* commit '200496b5714675a31376e78977713fcbad775fb5':
  ANR caused by incorrect cleanup in BroadcastQueue.
2014-11-26 21:47:35 +00:00
Craig Mautner
200496b571 Merge "ANR caused by incorrect cleanup in BroadcastQueue." 2014-11-26 21:43:59 +00: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
d76737a732 am b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app""
* commit 'b802cd6767c43a85645279a67bb41320058fdb60':
  APK still has privileged flag after being moved from "/system/priv-app"
2014-11-26 18:59:13 +00:00
Ignacio Solla
59565277d9 am c67b21fa: Merge "[WebView] Allow the WebView to be compiled against the system SDK."
* commit 'c67b21fa3ff17a1003dc805bb456c41a98bdf964':
  [WebView] Allow the WebView to be compiled against the system SDK.
2014-11-26 18:59:06 +00:00
Elliott Hughes
8e1bbfe0f1 Mention ProGuard in the JNI documentation.
Change-Id: I7822ec1eca0290eba1f4b08eca6794b41172d606
2014-11-26 10:51:37 -08: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
Ignacio Solla
c67b21fa3f Merge "[WebView] Allow the WebView to be compiled against the system SDK." 2014-11-26 18:31:01 +00:00
Conley Owens
6a53bd9ddb am 69d28437: Merge "RRO tests: fix potential NPE"
* commit '69d28437d3416301895639b4c51f9b31842126f5':
  RRO tests: fix potential NPE
2014-11-26 18:02:45 +00:00
Conley Owens
c657b302e5 am ed23786c: Merge "RRO tests: adapt tests to split apks"
* commit 'ed23786cc5b19c66c526a576dd39dba720fa5340':
  RRO tests: adapt tests to split apks
2014-11-26 18:02:38 +00:00
Conley Owens
69d28437d3 Merge "RRO tests: fix potential NPE" 2014-11-26 17:57:09 +00:00
Craig Mautner
1c48e3029b am a7a99981: Merge "Fix Presentation window is removed on stack change"
* commit 'a7a999816fed3e0bdd8e65a9b90f7fad2ca5ae16':
  Fix Presentation window is removed on stack change
2014-11-26 17:57:02 +00:00
Conley Owens
ed23786cc5 Merge "RRO tests: adapt tests to split apks" 2014-11-26 17:56:48 +00:00
Craig Mautner
a7a999816f Merge "Fix Presentation window is removed on stack change" 2014-11-26 17:53:00 +00:00
Craig Mautner
f9819b0119 am 17fc8574: Merge "Sync focus stack frame and layer with focus app."
* commit '17fc8574e55d542744f22e34bf1103bcfbefbc27':
  Sync focus stack frame and layer with focus app.
2014-11-26 17:48:16 +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
77f8112d52 am aed35d6b: Merge "Not include fullscreen opaque window on screenshot"
* commit 'aed35d6b57b4076b9b405c384f6d1f65253ab2b0':
  Not include fullscreen opaque window on screenshot
2014-11-26 17:41:57 +00:00
Craig Mautner
aed35d6b57 Merge "Not include fullscreen opaque window on screenshot" 2014-11-26 17:37:37 +00:00
Craig Mautner
6c3548a961 am e7648472: Merge "Measure absolute value of pointer motion distance"
* commit 'e76484721e5b7bd7c2f11a97f04440434b5a66ee':
  Measure absolute value of pointer motion distance
2014-11-26 17:31:08 +00:00
Craig Mautner
e76484721e Merge "Measure absolute value of pointer motion distance" 2014-11-26 17:26:47 +00:00
Kenny Root
3476a2a0b2 am 564ec716: Merge "Track change to Conscrypt"
* commit '564ec716f4ac2f71d7d4e6eb481075603e183b4f':
  Track change to Conscrypt
2014-11-26 17:13:48 +00:00
Kenny Root
564ec716f4 Merge "Track change to Conscrypt" 2014-11-26 17:09:40 +00:00