119833 Commits

Author SHA1 Message Date
Carlos Valdivia
9272db024d am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit 'c45bd7f20987ed2fd29b9192edb38d02b4caa23b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:17:11 -08:00
Paul Lawrence
da37ed8b0a am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit 'b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:16:49 -08:00
Paul Lawrence
b9ba0c6c43 Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.

The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature.  This means that an authenticator implementer can only
exploit apps they control.

This is a backport of 5bab9daf3cf66f4de19f8757e386030e8bef23ce

Bug: 7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
2014-02-27 09:09:48 -08:00
Carlos Valdivia
c45bd7f209 Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.

The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature.  This means that an authenticator implementer can only
exploit apps they control.

Bug: 7699048
Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce
(cherry picked from commit 5bab9daf3cf66f4de19f8757e386030e8bef23ce)
2014-02-27 17:03:15 +00:00
Narayan Kamath
7aeb43072a am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '2525acf5a9855d748c008268bb26d6f6d5045d84':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
2014-02-27 13:26:39 +00:00
Narayan Kamath
2525acf5a9 am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit 'e4dae5f2c26f5992a31f8ce15811fc082647ddb8':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
2014-02-27 05:20:52 -08:00
Narayan Kamath
9fc8e6fe8f am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit 'f61add84c28be06c190d5594a41a7ef84b7666fe':
  Make getAssetInt throw unconditionally.
2014-02-27 13:19:15 +00:00
Narayan Kamath
e4dae5f2c2 Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 2014-02-27 13:18:07 +00:00
Narayan Kamath
f61add84c2 am 2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit '2000fe58332dffaad34c618fe35840992cb0f571':
  Make getAssetInt throw unconditionally.
2014-02-27 05:15:56 -08:00
Narayan Kamath
2000fe5833 Merge "Make getAssetInt throw unconditionally." 2014-02-27 13:13:08 +00:00
Jeff Brown
71e21fec61 am 6ca90042: Add touch.wake IDC property to control wakeup.
* commit '6ca90042b398153e063cf69dea784e201e76a9ee':
  Add touch.wake IDC property to control wakeup.
2014-02-27 01:59:02 +00:00
Jeff Brown
6ca90042b3 Add touch.wake IDC property to control wakeup.
Normally we do not wake the device when the internal touch screen is
touched.  This behavior can now be configured by setting a property
in the input device configuration file.  Add the following line to
the IDC file to enable an initial touch to wake the device from sleep.

  touch.wake = 1

Change-Id: Ifd6d4f51afacd30d85f475725a66e6fcccde9cbb
2014-02-26 15:15:53 -08:00
Chris Craik
74a8b916ac am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE"
* commit '59ff85af314e2984068943f5572ac40ef381edea':
  Fix AOSP build - DO NOT MERGE
2014-02-26 19:10:44 +00:00
Chris Craik
aecb8c43d0 am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"
* commit '7b4cce68853d8bcfce2b6bd7f999915063eb56d2':
  Fix graphics corruption caused by HWUI caches
2014-02-26 19:10:39 +00:00
Ashok Bhat
64d38d9f48 AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen
script

This will allow eglGetDisplay(int) to work on both 32-bit and
64-bit systems when EGL_DEFAULT_DISPLAY is passed as a parameter.

Change-Id: Idf27d6e00d623d331bb2d4d7f85fa450e0db26c9
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-26 19:07:54 +00:00
Chris Craik
59ff85af31 am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE"
* commit '2729857df6c559b37248c96b78303b662212d14b':
  Fix AOSP build - DO NOT MERGE
2014-02-26 11:06:30 -08:00
Chris Craik
7b4cce6885 am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"
* commit 'c3bac8a096cc5661cf91c8c0aa9b7dd0fc099c5d':
  Fix graphics corruption caused by HWUI caches
2014-02-26 11:06:27 -08:00
Chris Craik
2729857df6 Merge "Fix AOSP build - DO NOT MERGE" 2014-02-26 18:48:27 +00:00
Chris Craik
c3bac8a096 Merge "Fix graphics corruption caused by HWUI caches" 2014-02-26 18:48:00 +00:00
Chris Craik
2c42b79c6c Fix AOSP build - DO NOT MERGE
Change-Id: I42b420c2ce89ce364a2809b28b827964e6923fa1
2014-02-26 10:44:50 -08:00
Sangkyu Lee
36fad8f6fc Fix graphics corruption caused by HWUI caches
Some caches(PatchCache, TextureCache, PathCache) for HWUI
uses deferred removal for their cache entries even though
actual resource objects are immediately freed by
ResourceCache.
For this reason, the uniqueness of a resource address in
the caches is not guaranteed in specific cases.
(Because malloc() can return the same address when malloc()
and free() called very frequently.)

So it can be possible the cache have two cache entries for
two different resources but the same memory address.
(Of course one of the resources is already freed.)
It also can be possible mGarbage vector in PatchCache has
duplicated addresses and this can lead to duplicated free
blocks in the free block list and graphics corruption.
(Deferred removal was implmeneted based on an assumption of
unique resource addresses.)

So this patch makes sure resource objects are freed after
the resources are removed from the caches to guarantee
the uniqueness of a resource address and prevent graphics
corruption.

Change-Id: I040f033a4fc783d2c4bc04b113589657c36fb15b
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
2014-02-26 10:43:26 -08:00
Craig Mautner
91df776654 am 42ec5035: Modify API to hide ActivityView.
* commit '42ec5035672fbfe701ddbf90dcc4390dab9188af':
  Modify API to hide ActivityView.
2014-02-25 20:22:28 +00:00
Craig Mautner
42ec503567 Modify API to hide ActivityView.
Fixes build too.

Change-Id: Ibd571cf36c89691a37c45db59c31237fee17adac
2014-02-25 12:17:15 -08:00
Craig Mautner
d4c819c002 am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev
* commit 'dd9ce6287eb9ccae8d527e6750c91b0bd47834fc':
  Clean up activities and displays when done
2014-02-25 18:49:37 +00:00
Craig Mautner
dd9ce6287e Merge "Clean up activities and displays when done" into klp-modular-dev 2014-02-25 18:46:01 +00:00
Craig Mautner
95da1087ed Clean up activities and displays when done
More maintenance fixes.

Fix bug 13157352.

Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
2014-02-25 10:40:18 -08:00
Robert Greenwalt
860ac9e45f am 41c684a7: am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '41c684a7b5602991cb1af63b2bcaa4e41812dfb9':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:29:25 +00:00
Robert Greenwalt
41c684a7b5 am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '0d39ef72112972dfadd70ef14c733672e4a2d646':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:25:11 +00:00
Robert Greenwalt
0d39ef7211 am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit 'cf73f46a514f5c2b1a0de137ed203401417307b4':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:21:50 +00:00
Robert Greenwalt
cf73f46a51 am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '43ec3b939b732ea2d3b26635c51a6c91f2692270':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:18:05 +00:00
Robert Greenwalt
43ec3b939b am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:14:26 +00:00
Robert Greenwalt
1f9ebc5fa7 am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 10:12:35 -08:00
Robert Greenwalt
868d4c3410 am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '950230663fb3a9af438ec2ee57605fc9e7a58428':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 10:09:13 -08:00
Hui Lu
eeb291b7f3 am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit '95e3cba1f66af5594b5bdc210426ced44dd7b7ac':
  Reconnect/teardown proxy network connectivity.
2014-02-25 17:56:42 +00:00
Hui Lu
95e3cba1f6 Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 2014-02-25 17:53:41 +00:00
Narayan Kamath
2d19d202bd Make getAssetInt throw unconditionally.
All callers have been moved over to getNativeAsset, and
this method has been hidden from the public API internally.

Change-Id: I5f29b5ddb4449adadf426e49a4085c7320289a15
2014-02-25 15:48:07 +00:00
Mike Lockwood
6eff99494d am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '0fc59cd958b87d015deac63797fcbfbcec518389':
  UsbDeviceManager: Fix race condition entering USB accessory mode
2014-02-25 15:48:03 +00:00
Mike Lockwood
0fc59cd958 am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit 'da2bbaf219117f7507c5c0015c41347a9cc27507':
  UsbDeviceManager: Fix race condition entering USB accessory mode
2014-02-25 15:44:24 +00:00
Mike Lockwood
da2bbaf219 am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '2c7b913e367670dde337893efd59029c054019fc':
  UsbDeviceManager: Fix race condition entering USB accessory mode
2014-02-25 15:41:11 +00:00
Mike Lockwood
2c7b913e36 am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '5daec5b58a89779b0f8775f52859bae0bda17b23':
  UsbDeviceManager: Fix race condition entering USB accessory mode
2014-02-25 15:38:25 +00:00
Mike Lockwood
5daec5b58a Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 2014-02-25 15:35:34 +00:00
Narayan Kamath
a6f70d8b2d am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"
* commit '7fe5978bf7c4b473d8f6db5a12cfdcd110511331':
  Use reinterpret_cast when an integer is cast to a pointer
2014-02-25 13:14:35 +00:00
Narayan Kamath
614b00de9c am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"
* commit 'a88abfb3a5dccdad6210b294843fa2e21a27d378':
  Use long for pointers in opengl/EGL classes
2014-02-25 13:14:30 +00:00
Narayan Kamath
7fe5978bf7 am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"
* commit '2ba70fd49bfcbb516e75c198c106764609335feb':
  Use reinterpret_cast when an integer is cast to a pointer
2014-02-25 05:11:43 -08:00
Narayan Kamath
a88abfb3a5 am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"
* commit '6ab07fac49d6b618883a2ef4cea11f0959b3abe3':
  Use long for pointers in opengl/EGL classes
2014-02-25 05:11:40 -08:00
Narayan Kamath
2ba70fd49b Merge "Use reinterpret_cast when an integer is cast to a pointer" 2014-02-25 13:05:48 +00:00
Narayan Kamath
6ab07fac49 Merge "Use long for pointers in opengl/EGL classes" 2014-02-25 13:05:44 +00:00
Jeff Brown
ae8106ef9c am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev
* commit '2326acb591d889d9492219f5f8f79940fd66ba70':
  Fix typo that causes dreaming on battery.
2014-02-25 00:32:37 +00:00
Jeff Brown
2326acb591 Merge "Fix typo that causes dreaming on battery." into klp-modular-dev 2014-02-25 00:27:41 +00:00
Justin Koh
2235288538 am bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev
* commit 'bf3a45f3adc435d7670ac5a92d2fb73b1e21f7aa':
  DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
2014-02-25 00:24:51 +00:00