159320 Commits

Author SHA1 Message Date
Adam Lesinski
503071ae41 am a2b5067a: Merge "RRO: prevent duplicate system overlays"
* commit 'a2b5067aeef5b2d68a7a2f7b4edc7ee0908b5d5b':
  RRO: prevent duplicate system overlays
2014-12-03 17:49:12 +00:00
Adam Lesinski
a2b5067aee Merge "RRO: prevent duplicate system overlays" 2014-12-03 17:44:18 +00:00
Sergii Skorokhodov
9edcc7be49 Correct check of is user running
Before the ActivityManagerService sends an intent or
starts an activity it checks if target user is in
mStartedUsers array.

When removing a non-owner user process the
UserStartedState instance will still be in mStartedUsers
array with mState STOPPING or SHUTDOWN.

This should be checked before sending an intent or start
an activity.

isUserRunningLocked(...) will interpret mState STOPPING
and SHUTDOWN as a non running user.

Change-Id: I1b51bcdb62bdd0f6dbe05dab4d529d4ad40d0d44
2014-12-03 08:36:26 +01:00
Jason Sams
b940599a75 am abdaa32d: Merge "Fix bug in passing of context flags and version."
* commit 'abdaa32dd79c915d0e419560c8eaa64e3d946b77':
  Fix bug in passing of context flags and version.
2014-12-02 23:52:12 +00:00
Jason Sams
abdaa32dd7 Merge "Fix bug in passing of context flags and version." 2014-12-02 23:45:17 +00:00
Adam Lesinski
e580d6617f am e89a2865: Merge changes If2c7e09f,Ie21f227c
* commit 'e89a286541e242ad96705fcdd1fe2c6a9eafb4a0':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
2014-12-02 23:00:06 +00:00
Adam Lesinski
e89a286541 Merge changes If2c7e09f,Ie21f227c
* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
2014-12-02 22:52:37 +00:00
Chris Wren
47a5cb122a am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"
* commit 'acd01ff07668a608cb4890a2ea1533a2397149c8':
  Keep deleteIntent when copying Notification attributes
2014-12-02 22:38:28 +00:00
Chris Wren
acd01ff076 Merge "Keep deleteIntent when copying Notification attributes" 2014-12-02 22:31:09 +00:00
Jason Sams
81cd2b18bd Fix bug in passing of context flags and version.
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
2014-12-02 12:37:04 -08:00
Alan Viverette
850cdbe58c am 71c5d62d: Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"
* commit '71c5d62d9680207c4d3d25ac3f590f3667b250eb':
  Consider RTL layout in DPAD navigation in AbsSeekBar
2014-12-02 19:36:03 +00:00
Alan Viverette
71c5d62d96 Merge "Consider RTL layout in DPAD navigation in AbsSeekBar" 2014-12-02 19:21:22 +00:00
Craig Mautner
877d89399a am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"
* commit 'f6be7d177a740f86a4ae3b8685cc9e2f31506352':
  [ActivityManager] Fix race condition in pss collection
2014-12-02 19:05:01 +00:00
Craig Mautner
f6be7d177a Merge "[ActivityManager] Fix race condition in pss collection" 2014-12-02 18:57:36 +00:00
Craig Mautner
a370d9d19a am f54954f9: Merge "bug fix possible NPE while startProcessLocked()"
* commit 'f54954f97599f83584ab736d931b1fe1aff8890c':
  bug fix possible NPE while startProcessLocked()
2014-12-02 18:03:46 +00:00
Craig Mautner
f54954f975 Merge "bug fix possible NPE while startProcessLocked()" 2014-12-02 17:57:14 +00:00
Craig Mautner
ca017a38c9 am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
* commit '50f513c56989337aa0a48304213dd1deee2a0ede':
  [ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-02 17:56:09 +00:00
Craig Mautner
50f513c569 Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" 2014-12-02 17:50:31 +00:00
louis_chang
62cfde1442 [ActivityManager] Fix race condition in pss collection
Symptom:
There has a race condition that two threads are accessing
the mPendingPssProcesses simultaneously. One of the thread
is collecting the process pss by looping the mPendingPssProcesses.
The other thread is requesting to collect pss of all processes,
which clears mPendingPssProcesses and adding processes back.

Solution:
Avoid race condition by adding synchornized protection.

Change-Id: Ifb090eda9c4a1b8e3fd980fe0171e9dd77773b46
2014-12-02 12:57:39 +08:00
louis_chang
3d9c431ca4 [ActivityManager] Invalidate last screenshot when activity relaunched
Symptom:
The task thumbnail is not updated when activity relaunched.

Reproduce Steps:
1. Put device in portrait
2. Launch Calculator
3. Launch Recent App (the Calculator's screenshot is correct)
4. Rotate device to landscape
5. Click Calculator in Recent App to return to Calculator (Calculator has relaunched to landsacpe ui)
6. Launch Recent App again (the Calculator's screenshot is not updated)

Change-Id: I92e951ea2ee215c52ca6e50cf6f9e02deb787bce
2014-12-02 12:38:05 +08:00
younghwan1.kim
8f6fc81500 bug fix possible NPE while startProcessLocked()
In case, process doesn't create well while startingProcessLocked().
There is possibility to make NPE.
Setting app's crash handler needs to be assigned after null check routine.

Change-Id: I67fb6427f72d93f79fed36eb44c47d37eafdac31
2014-12-02 13:04:40 +09:00
Jesse Hall
9dec9e9d65 am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
* commit '1ee377764a59d0e2c245dd037006fa8c086f5683':
  Avoid overwriting EGL14.EGL_NO_SURFACE
2014-12-02 00:42:23 +00:00
Jesse Hall
1ee377764a Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" 2014-12-02 00:35:12 +00:00
dcashman
c25cfc57e0 am 24d02652: Merge "Prevent EntropyMixer from registering with service manager."
* commit '24d02652bf8df12a41acf500d958109ef3d99b9a':
  Prevent EntropyMixer from registering with service manager.
2014-12-01 23:54:11 +00:00
Michael Wright
6b35af89f0 am c859b85c: Merge "Added Razer USA, Ltd serval"
* commit 'c859b85cb530e608da775bb18744a996483a0311':
  Added Razer USA, Ltd serval
2014-12-01 23:54:04 +00:00
dcashman
24d02652bf Merge "Prevent EntropyMixer from registering with service manager." 2014-12-01 23:49:26 +00:00
Michael Wright
c859b85cb5 Merge "Added Razer USA, Ltd serval" 2014-12-01 23:47:37 +00:00
John Reck
d51205fda7 am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"
* commit '6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3':
  Prevent calling GL functions with an invalid surface
2014-12-01 21:35:40 +00:00
John Reck
6afc5cf3d9 Merge "Prevent calling GL functions with an invalid surface" 2014-12-01 21:28:27 +00:00
Craig Mautner
b5981aa8d1 am ee7c30e1: Merge "Avoid capture all black screenshot bitmap"
* commit 'ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3':
  Avoid capture all black screenshot bitmap
2014-12-01 16:44:24 +00:00
Craig Mautner
ee7c30e1f9 Merge "Avoid capture all black screenshot bitmap" 2014-12-01 16:38:14 +00:00
Yohann Roussel
3e5223fd02 am 6829daa4: Merge "Add tests about annotations and enum."
* commit '6829daa44a66333ef869dbcd655eac220c34561b':
  Add tests about annotations and enum.
2014-12-01 10:05:45 +00:00
Yohann Roussel
6829daa44a Merge "Add tests about annotations and enum." 2014-12-01 09:30:59 +00:00
tingna_sung
e3ca048397 Avoid capture all black screenshot bitmap
Captured screenshot bitmap is all black one if none of windows is
surface shown.

Change-Id: I651b2ade1865926d61f945167d60219535fa8bf8
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-12-01 15:22:43 +08:00
Michael Wright
fa9100814a am 461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"
* commit '461eaf79a726f5a754f467d7f3dd163aaa463857':
  Add keylayout for Logitech RedHawk Gamepad
2014-12-01 04:43:34 +00:00
Michael Wright
461eaf79a7 Merge "Add keylayout for Logitech RedHawk Gamepad" 2014-12-01 04:36:25 +00:00
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