OSDN Git Service

android-x86/frameworks-base.git
9 years agoam a2b5067a: Merge "RRO: prevent duplicate system overlays"
Adam Lesinski [Wed, 3 Dec 2014 17:49:12 +0000 (17:49 +0000)]
am a2b5067a: Merge "RRO: prevent duplicate system overlays"

* commit 'a2b5067aeef5b2d68a7a2f7b4edc7ee0908b5d5b':
  RRO: prevent duplicate system overlays

9 years agoMerge "RRO: prevent duplicate system overlays"
Adam Lesinski [Wed, 3 Dec 2014 17:44:17 +0000 (17:44 +0000)]
Merge "RRO: prevent duplicate system overlays"

9 years agoam abdaa32d: Merge "Fix bug in passing of context flags and version."
Jason Sams [Tue, 2 Dec 2014 23:52:12 +0000 (23:52 +0000)]
am abdaa32d: Merge "Fix bug in passing of context flags and version."

* commit 'abdaa32dd79c915d0e419560c8eaa64e3d946b77':
  Fix bug in passing of context flags and version.

9 years agoMerge "Fix bug in passing of context flags and version."
Jason Sams [Tue, 2 Dec 2014 23:45:16 +0000 (23:45 +0000)]
Merge "Fix bug in passing of context flags and version."

9 years agoam e89a2865: Merge changes If2c7e09f,Ie21f227c
Adam Lesinski [Tue, 2 Dec 2014 23:00:06 +0000 (23:00 +0000)]
am e89a2865: Merge changes If2c7e09f,Ie21f227c

* commit 'e89a286541e242ad96705fcdd1fe2c6a9eafb4a0':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets

9 years agoMerge changes If2c7e09f,Ie21f227c
Adam Lesinski [Tue, 2 Dec 2014 22:52:36 +0000 (22:52 +0000)]
Merge changes If2c7e09f,Ie21f227c

* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets

9 years agoam acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"
Chris Wren [Tue, 2 Dec 2014 22:38:28 +0000 (22:38 +0000)]
am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"

* commit 'acd01ff07668a608cb4890a2ea1533a2397149c8':
  Keep deleteIntent when copying Notification attributes

9 years agoMerge "Keep deleteIntent when copying Notification attributes"
Chris Wren [Tue, 2 Dec 2014 22:31:06 +0000 (22:31 +0000)]
Merge "Keep deleteIntent when copying Notification attributes"

9 years agoFix bug in passing of context flags and version.
Jason Sams [Tue, 2 Dec 2014 20:36:43 +0000 (12:36 -0800)]
Fix bug in passing of context flags and version.

Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7

9 years agoam 71c5d62d: Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"
Alan Viverette [Tue, 2 Dec 2014 19:36:03 +0000 (19:36 +0000)]
am 71c5d62d: Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"

* commit '71c5d62d9680207c4d3d25ac3f590f3667b250eb':
  Consider RTL layout in DPAD navigation in AbsSeekBar

9 years agoMerge "Consider RTL layout in DPAD navigation in AbsSeekBar"
Alan Viverette [Tue, 2 Dec 2014 19:21:21 +0000 (19:21 +0000)]
Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"

9 years agoam f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"
Craig Mautner [Tue, 2 Dec 2014 19:05:01 +0000 (19:05 +0000)]
am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"

* commit 'f6be7d177a740f86a4ae3b8685cc9e2f31506352':
  [ActivityManager] Fix race condition in pss collection

9 years agoMerge "[ActivityManager] Fix race condition in pss collection"
Craig Mautner [Tue, 2 Dec 2014 18:57:34 +0000 (18:57 +0000)]
Merge "[ActivityManager] Fix race condition in pss collection"

9 years agoam f54954f9: Merge "bug fix possible NPE while startProcessLocked()"
Craig Mautner [Tue, 2 Dec 2014 18:03:46 +0000 (18:03 +0000)]
am f54954f9: Merge "bug fix possible NPE while startProcessLocked()"

* commit 'f54954f97599f83584ab736d931b1fe1aff8890c':
  bug fix possible NPE while startProcessLocked()

9 years agoMerge "bug fix possible NPE while startProcessLocked()"
Craig Mautner [Tue, 2 Dec 2014 17:57:11 +0000 (17:57 +0000)]
Merge "bug fix possible NPE while startProcessLocked()"

9 years agoam 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaun...
Craig Mautner [Tue, 2 Dec 2014 17:56:09 +0000 (17:56 +0000)]
am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"

* commit '50f513c56989337aa0a48304213dd1deee2a0ede':
  [ActivityManager] Invalidate last screenshot when activity relaunched

9 years agoMerge "[ActivityManager] Invalidate last screenshot when activity relaunched"
Craig Mautner [Tue, 2 Dec 2014 17:50:30 +0000 (17:50 +0000)]
Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"

9 years ago[ActivityManager] Fix race condition in pss collection
louis_chang [Tue, 2 Dec 2014 04:57:39 +0000 (12:57 +0800)]
[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

9 years ago[ActivityManager] Invalidate last screenshot when activity relaunched
louis_chang [Tue, 2 Dec 2014 04:38:05 +0000 (12:38 +0800)]
[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

9 years agobug fix possible NPE while startProcessLocked()
younghwan1.kim [Tue, 2 Dec 2014 04:04:40 +0000 (13:04 +0900)]
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

9 years agoam 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
Jesse Hall [Tue, 2 Dec 2014 00:42:23 +0000 (00:42 +0000)]
am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"

* commit '1ee377764a59d0e2c245dd037006fa8c086f5683':
  Avoid overwriting EGL14.EGL_NO_SURFACE

9 years agoMerge "Avoid overwriting EGL14.EGL_NO_SURFACE"
Jesse Hall [Tue, 2 Dec 2014 00:35:11 +0000 (00:35 +0000)]
Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"

9 years agoam 24d02652: Merge "Prevent EntropyMixer from registering with service manager."
dcashman [Mon, 1 Dec 2014 23:54:11 +0000 (23:54 +0000)]
am 24d02652: Merge "Prevent EntropyMixer from registering with service manager."

* commit '24d02652bf8df12a41acf500d958109ef3d99b9a':
  Prevent EntropyMixer from registering with service manager.

9 years agoam c859b85c: Merge "Added Razer USA, Ltd serval"
Michael Wright [Mon, 1 Dec 2014 23:54:04 +0000 (23:54 +0000)]
am c859b85c: Merge "Added Razer USA, Ltd serval"

* commit 'c859b85cb530e608da775bb18744a996483a0311':
  Added Razer USA, Ltd serval

9 years agoMerge "Prevent EntropyMixer from registering with service manager."
dcashman [Mon, 1 Dec 2014 23:49:25 +0000 (23:49 +0000)]
Merge "Prevent EntropyMixer from registering with service manager."

9 years agoMerge "Added Razer USA, Ltd serval"
Michael Wright [Mon, 1 Dec 2014 23:47:37 +0000 (23:47 +0000)]
Merge "Added Razer USA, Ltd serval"

9 years agoam 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"
John Reck [Mon, 1 Dec 2014 21:35:40 +0000 (21:35 +0000)]
am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"

* commit '6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3':
  Prevent calling GL functions with an invalid surface

9 years agoMerge "Prevent calling GL functions with an invalid surface"
John Reck [Mon, 1 Dec 2014 21:28:26 +0000 (21:28 +0000)]
Merge "Prevent calling GL functions with an invalid surface"

9 years agoam ee7c30e1: Merge "Avoid capture all black screenshot bitmap"
Craig Mautner [Mon, 1 Dec 2014 16:44:24 +0000 (16:44 +0000)]
am ee7c30e1: Merge "Avoid capture all black screenshot bitmap"

* commit 'ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3':
  Avoid capture all black screenshot bitmap

9 years agoMerge "Avoid capture all black screenshot bitmap"
Craig Mautner [Mon, 1 Dec 2014 16:38:14 +0000 (16:38 +0000)]
Merge "Avoid capture all black screenshot bitmap"

9 years agoam 6829daa4: Merge "Add tests about annotations and enum."
Yohann Roussel [Mon, 1 Dec 2014 10:05:45 +0000 (10:05 +0000)]
am 6829daa4: Merge "Add tests about annotations and enum."

* commit '6829daa44a66333ef869dbcd655eac220c34561b':
  Add tests about annotations and enum.

9 years agoMerge "Add tests about annotations and enum."
Yohann Roussel [Mon, 1 Dec 2014 09:30:59 +0000 (09:30 +0000)]
Merge "Add tests about annotations and enum."

9 years agoAvoid capture all black screenshot bitmap
tingna_sung [Tue, 21 Oct 2014 05:22:16 +0000 (13:22 +0800)]
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>
9 years agoam 461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"
Michael Wright [Mon, 1 Dec 2014 04:43:34 +0000 (04:43 +0000)]
am 461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"

* commit '461eaf79a726f5a754f467d7f3dd163aaa463857':
  Add keylayout for Logitech RedHawk Gamepad

9 years agoMerge "Add keylayout for Logitech RedHawk Gamepad"
Michael Wright [Mon, 1 Dec 2014 04:36:23 +0000 (04:36 +0000)]
Merge "Add keylayout for Logitech RedHawk Gamepad"

9 years agoam c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will...
Craig Mautner [Mon, 1 Dec 2014 00:26:11 +0000 (00:26 +0000)]
am c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released."

* commit 'c4cf78f4d3154af317e686c9ef702a26cf28f8f2':
  [ActivityManager] Ensure provider external access count will be released.

9 years agoam 25596374: Merge "[ActivityManager] Prevent provider from been created twice."
Craig Mautner [Mon, 1 Dec 2014 00:22:10 +0000 (00:22 +0000)]
am 25596374: Merge "[ActivityManager] Prevent provider from been created twice."

* commit '255963742982daf46eb665a2934bd61e7ed95c81':
  [ActivityManager] Prevent provider from been created twice.

9 years agoMerge "[ActivityManager] Ensure provider external access count will be released."
Craig Mautner [Mon, 1 Dec 2014 00:20:33 +0000 (00:20 +0000)]
Merge "[ActivityManager] Ensure provider external access count will be released."

9 years agoam 94ac906b: Merge "Fix pointer index out of range exception"
Craig Mautner [Mon, 1 Dec 2014 00:16:57 +0000 (00:16 +0000)]
am 94ac906b: Merge "Fix pointer index out of range exception"

* commit '94ac906b103b0f03eca2000815bf306209f33109':
  Fix pointer index out of range exception

9 years agoam 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"
Craig Mautner [Mon, 1 Dec 2014 00:16:52 +0000 (00:16 +0000)]
am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"

* commit '208bd91b2467dd5d4c41d5ada5c2bfa15c1b48c4':
  [ActivityManager] Avoid system server crash due to package removed

9 years agoMerge "[ActivityManager] Prevent provider from been created twice."
Craig Mautner [Mon, 1 Dec 2014 00:16:38 +0000 (00:16 +0000)]
Merge "[ActivityManager] Prevent provider from been created twice."

9 years agoMerge "Fix pointer index out of range exception"
Craig Mautner [Mon, 1 Dec 2014 00:13:27 +0000 (00:13 +0000)]
Merge "Fix pointer index out of range exception"

9 years agoMerge "[ActivityManager] Avoid system server crash due to package removed"
Craig Mautner [Mon, 1 Dec 2014 00:11:51 +0000 (00:11 +0000)]
Merge "[ActivityManager] Avoid system server crash due to package removed"

9 years agoam 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"
Craig Mautner [Sun, 30 Nov 2014 23:59:46 +0000 (23:59 +0000)]
am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"

* commit '7db48ed03623834f7b8b420c83ab7916f6b39a8a':
  Reset killedByAm flag at attachApplicationLocked

9 years agoam 728e6c6c: Merge "Prevent showing immersive confirmation unexpectedly"
Craig Mautner [Sun, 30 Nov 2014 23:59:40 +0000 (23:59 +0000)]
am 728e6c6c: Merge "Prevent showing immersive confirmation unexpectedly"

* commit '728e6c6c1789a1ae141bd0ecc21e8d9dca8dadcc':
  Prevent showing immersive confirmation unexpectedly

9 years agoMerge "Reset killedByAm flag at attachApplicationLocked"
Craig Mautner [Sun, 30 Nov 2014 23:55:12 +0000 (23:55 +0000)]
Merge "Reset killedByAm flag at attachApplicationLocked"

9 years agoMerge "Prevent showing immersive confirmation unexpectedly"
Craig Mautner [Sun, 30 Nov 2014 23:54:42 +0000 (23:54 +0000)]
Merge "Prevent showing immersive confirmation unexpectedly"

9 years agoam 2c53d22b: Merge "Mention ProGuard in the JNI documentation."
Elliott Hughes [Thu, 27 Nov 2014 18:07:00 +0000 (18:07 +0000)]
am 2c53d22b: Merge "Mention ProGuard in the JNI documentation."

* commit '2c53d22bcc00838125cd70e17915da6ded5d0aca':
  Mention ProGuard in the JNI documentation.

9 years agoMerge "Mention ProGuard in the JNI documentation."
Elliott Hughes [Thu, 27 Nov 2014 18:01:33 +0000 (18:01 +0000)]
Merge "Mention ProGuard in the JNI documentation."

9 years agoam 10a36fb7: Merge "Stop using ErrorStrings for apache."
Narayan Kamath [Thu, 27 Nov 2014 17:58:21 +0000 (17:58 +0000)]
am 10a36fb7: Merge "Stop using ErrorStrings for apache."

* commit '10a36fb749d05bd90fc8ef3114562cacb631c07c':
  Stop using ErrorStrings for apache.

9 years agoMerge "Stop using ErrorStrings for apache."
Narayan Kamath [Thu, 27 Nov 2014 17:53:04 +0000 (17:53 +0000)]
Merge "Stop using ErrorStrings for apache."

9 years agoStop using ErrorStrings for apache.
Narayan Kamath [Thu, 27 Nov 2014 17:20:21 +0000 (17:20 +0000)]
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

9 years agoam 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class."
Narayan Kamath [Thu, 27 Nov 2014 14:03:57 +0000 (14:03 +0000)]
am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class."

* commit '8036d2ec739636c1913a417cace97a5027d0270d':
  Delete general sounding "CharArrayBuffers" class.

9 years agoMerge "Delete general sounding "CharArrayBuffers" class."
Narayan Kamath [Thu, 27 Nov 2014 13:57:27 +0000 (13:57 +0000)]
Merge "Delete general sounding "CharArrayBuffers" class."

9 years agoDelete general sounding "CharArrayBuffers" class.
Narayan Kamath [Thu, 27 Nov 2014 12:58:52 +0000 (12:58 +0000)]
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

9 years agoam 14e28134: Merge "Delete unused class from android.net.http."
Narayan Kamath [Thu, 27 Nov 2014 13:03:34 +0000 (13:03 +0000)]
am 14e28134: Merge "Delete unused class from android.net.http."

* commit '14e28134c445435d71ed754e6be5867655d1dda3':
  Delete unused class from android.net.http.

9 years agoMerge "Delete unused class from android.net.http."
Narayan Kamath [Thu, 27 Nov 2014 12:58:32 +0000 (12:58 +0000)]
Merge "Delete unused class from android.net.http."

9 years agoDelete unused class from android.net.http.
Narayan Kamath [Thu, 27 Nov 2014 12:52:48 +0000 (12:52 +0000)]
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

9 years ago[ActivityManager] Prevent provider from been created twice.
riddle_hsu [Sat, 15 Nov 2014 10:25:34 +0000 (18:25 +0800)]
[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

9 years agoFix pointer index out of range exception
tingna_sung [Sat, 25 Oct 2014 13:52:47 +0000 (21:52 +0800)]
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>
9 years agoAdd keylayout for Logitech RedHawk Gamepad
Mathieu Meisser [Wed, 26 Nov 2014 23:44:42 +0000 (00:44 +0100)]
Add keylayout for Logitech RedHawk Gamepad

Change-Id: Iad03de3384052b360d6b9d887ca9540de68cd21e

9 years agoam 87c5f362: Merge "Fix bad exclude region in landscape"
Olawale Ogunwale [Wed, 26 Nov 2014 23:20:30 +0000 (23:20 +0000)]
am 87c5f362: Merge "Fix bad exclude region in landscape"

* commit '87c5f3621037eda3c4d141e5681d4acbbaa13944':
  Fix bad exclude region in landscape

9 years agoMerge "Fix bad exclude region in landscape"
Olawale Ogunwale [Wed, 26 Nov 2014 23:13:59 +0000 (23:13 +0000)]
Merge "Fix bad exclude region in landscape"

9 years agoReset killedByAm flag at attachApplicationLocked
Kazuki Nakayama [Thu, 29 May 2014 07:05:34 +0000 (16:05 +0900)]
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

9 years agoPrevent EntropyMixer from registering with service manager.
dcashman [Tue, 25 Nov 2014 20:59:12 +0000 (12:59 -0800)]
Prevent EntropyMixer from registering with service manager.

EntropyMixer is designed to be triggered in two ways, as either the
result of a self-set timer or of one of three system broadcasts.  It is not
meant to be triggered in any other way, so exposing it via servicemanager
is undesirable.

Bug: 18106000

Cherry-pick of commit: 9287e0dd272b85b475e33bcbd7d868517a0f98f9

Change-Id: I9aeb35e7ffde75090f4234ea193514fb883b1425

9 years agoam 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue."
Craig Mautner [Wed, 26 Nov 2014 21:47:35 +0000 (21:47 +0000)]
am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue."

* commit '200496b5714675a31376e78977713fcbad775fb5':
  ANR caused by incorrect cleanup in BroadcastQueue.

9 years agoMerge "ANR caused by incorrect cleanup in BroadcastQueue."
Craig Mautner [Wed, 26 Nov 2014 21:43:59 +0000 (21:43 +0000)]
Merge "ANR caused by incorrect cleanup in BroadcastQueue."

9 years agoANR caused by incorrect cleanup in BroadcastQueue.
Guobin Zhang [Fri, 7 Mar 2014 09:47:10 +0000 (17:47 +0800)]
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>
9 years agoam b802cd67: Merge "APK still has privileged flag after being moved from "/system...
Jeff Sharkey [Wed, 26 Nov 2014 18:59:13 +0000 (18:59 +0000)]
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"

9 years agoam c67b21fa: Merge "[WebView] Allow the WebView to be compiled against the system...
Ignacio Solla [Wed, 26 Nov 2014 18:59:06 +0000 (18:59 +0000)]
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.

9 years agoMention ProGuard in the JNI documentation.
Elliott Hughes [Tue, 25 Nov 2014 19:18:43 +0000 (11:18 -0800)]
Mention ProGuard in the JNI documentation.

Change-Id: I7822ec1eca0290eba1f4b08eca6794b41172d606

9 years agoMerge "APK still has privileged flag after being moved from "/system/priv-app""
Jeff Sharkey [Wed, 26 Nov 2014 18:35:10 +0000 (18:35 +0000)]
Merge "APK still has privileged flag after being moved from "/system/priv-app""

9 years agoMerge "[WebView] Allow the WebView to be compiled against the system SDK."
Ignacio Solla [Wed, 26 Nov 2014 18:31:00 +0000 (18:31 +0000)]
Merge "[WebView] Allow the WebView to be compiled against the system SDK."

9 years agoam 69d28437: Merge "RRO tests: fix potential NPE"
Conley Owens [Wed, 26 Nov 2014 18:02:45 +0000 (18:02 +0000)]
am 69d28437: Merge "RRO tests: fix potential NPE"

* commit '69d28437d3416301895639b4c51f9b31842126f5':
  RRO tests: fix potential NPE

9 years agoam ed23786c: Merge "RRO tests: adapt tests to split apks"
Conley Owens [Wed, 26 Nov 2014 18:02:38 +0000 (18:02 +0000)]
am ed23786c: Merge "RRO tests: adapt tests to split apks"

* commit 'ed23786cc5b19c66c526a576dd39dba720fa5340':
  RRO tests: adapt tests to split apks

9 years agoMerge "RRO tests: fix potential NPE"
Conley Owens [Wed, 26 Nov 2014 17:57:08 +0000 (17:57 +0000)]
Merge "RRO tests: fix potential NPE"

9 years agoam a7a99981: Merge "Fix Presentation window is removed on stack change"
Craig Mautner [Wed, 26 Nov 2014 17:57:02 +0000 (17:57 +0000)]
am a7a99981: Merge "Fix Presentation window is removed on stack change"

* commit 'a7a999816fed3e0bdd8e65a9b90f7fad2ca5ae16':
  Fix Presentation window is removed on stack change

9 years agoMerge "RRO tests: adapt tests to split apks"
Conley Owens [Wed, 26 Nov 2014 17:56:47 +0000 (17:56 +0000)]
Merge "RRO tests: adapt tests to split apks"

9 years agoMerge "Fix Presentation window is removed on stack change"
Craig Mautner [Wed, 26 Nov 2014 17:52:59 +0000 (17:52 +0000)]
Merge "Fix Presentation window is removed on stack change"

9 years agoam 17fc8574: Merge "Sync focus stack frame and layer with focus app."
Craig Mautner [Wed, 26 Nov 2014 17:48:16 +0000 (17:48 +0000)]
am 17fc8574: Merge "Sync focus stack frame and layer with focus app."

* commit '17fc8574e55d542744f22e34bf1103bcfbefbc27':
  Sync focus stack frame and layer with focus app.

9 years agoMerge "Sync focus stack frame and layer with focus app."
Craig Mautner [Wed, 26 Nov 2014 17:43:29 +0000 (17:43 +0000)]
Merge "Sync focus stack frame and layer with focus app."

9 years agoam aed35d6b: Merge "Not include fullscreen opaque window on screenshot"
Craig Mautner [Wed, 26 Nov 2014 17:41:57 +0000 (17:41 +0000)]
am aed35d6b: Merge "Not include fullscreen opaque window on screenshot"

* commit 'aed35d6b57b4076b9b405c384f6d1f65253ab2b0':
  Not include fullscreen opaque window on screenshot

9 years agoMerge "Not include fullscreen opaque window on screenshot"
Craig Mautner [Wed, 26 Nov 2014 17:37:37 +0000 (17:37 +0000)]
Merge "Not include fullscreen opaque window on screenshot"

9 years agoam e7648472: Merge "Measure absolute value of pointer motion distance"
Craig Mautner [Wed, 26 Nov 2014 17:31:08 +0000 (17:31 +0000)]
am e7648472: Merge "Measure absolute value of pointer motion distance"

* commit 'e76484721e5b7bd7c2f11a97f04440434b5a66ee':
  Measure absolute value of pointer motion distance

9 years agoMerge "Measure absolute value of pointer motion distance"
Craig Mautner [Wed, 26 Nov 2014 17:26:45 +0000 (17:26 +0000)]
Merge "Measure absolute value of pointer motion distance"

9 years agoam 564ec716: Merge "Track change to Conscrypt"
Kenny Root [Wed, 26 Nov 2014 17:13:48 +0000 (17:13 +0000)]
am 564ec716: Merge "Track change to Conscrypt"

* commit '564ec716f4ac2f71d7d4e6eb481075603e183b4f':
  Track change to Conscrypt

9 years agoMerge "Track change to Conscrypt"
Kenny Root [Wed, 26 Nov 2014 17:09:40 +0000 (17:09 +0000)]
Merge "Track change to Conscrypt"

9 years agoTrack change to Conscrypt
Kenny Root [Wed, 26 Nov 2014 17:08:40 +0000 (09:08 -0800)]
Track change to Conscrypt

Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413

9 years agoam fdbef408: Merge "Start MountService before performBootDexOpt"
Narayan Kamath [Wed, 26 Nov 2014 11:05:46 +0000 (11:05 +0000)]
am fdbef408: Merge "Start MountService before performBootDexOpt"

* commit 'fdbef4081d715de59525d58d44881b00f616616f':
  Start MountService before performBootDexOpt

9 years agoMerge "Start MountService before performBootDexOpt"
Narayan Kamath [Wed, 26 Nov 2014 10:59:28 +0000 (10:59 +0000)]
Merge "Start MountService before performBootDexOpt"

9 years agoAPK still has privileged flag after being moved from "/system/priv-app"
Akira Numata [Tue, 25 Nov 2014 08:50:12 +0000 (17:50 +0900)]
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

9 years agoFix Presentation window is removed on stack change
tingna_sung [Tue, 14 Oct 2014 10:05:34 +0000 (18:05 +0800)]
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>
9 years agoSync focus stack frame and layer with focus app.
tingna_sung [Sat, 25 Oct 2014 16:46:12 +0000 (00:46 +0800)]
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>
9 years agoNot include fullscreen opaque window on screenshot
tingna_sung [Tue, 21 Oct 2014 07:26:38 +0000 (15:26 +0800)]
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>
9 years agoMeasure absolute value of pointer motion distance
tingna_sung [Tue, 21 Oct 2014 09:09:57 +0000 (17:09 +0800)]
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>
9 years agoFix bad exclude region in landscape
tingna_sung [Tue, 21 Oct 2014 08:03:06 +0000 (16:03 +0800)]
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>
9 years agoPrevent calling GL functions with an invalid surface
Sangkyu Lee [Fri, 21 Nov 2014 09:05:41 +0000 (18:05 +0900)]
Prevent calling GL functions with an invalid surface

When destroying CanvasContext, the surface can be invalid
state. So the surface should be updated to null prior to
destroying GL resources to ensure that GL functions
are not called with an invalid surface.
Some GL implementation makes an error if GL functions
are called with an invalid surface. (Adreno 3xx)

Change-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294

9 years agoam af5bd75b: Merge "Enable stencil clipping within clearLayerRegions"
Chris Craik [Wed, 26 Nov 2014 00:02:17 +0000 (00:02 +0000)]
am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions"

* commit 'af5bd75b3d65fc710784f59d1c22c164312e2691':
  Enable stencil clipping within clearLayerRegions

9 years agoMerge "Enable stencil clipping within clearLayerRegions"
Chris Craik [Tue, 25 Nov 2014 23:56:32 +0000 (23:56 +0000)]
Merge "Enable stencil clipping within clearLayerRegions"

9 years agoam 2657717f: Merge "We have POSIX clocks."
Elliott Hughes [Tue, 25 Nov 2014 23:23:45 +0000 (23:23 +0000)]
am 2657717f: Merge "We have POSIX clocks."

* commit '2657717f97e0de689aa3d8cae75bb0053607839d':
  We have POSIX clocks.