drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,726 Commits 1 Branch 0 Tags
Commit Graph

159726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wonsik Kim
426b1bbc8c am 0313a0e9: Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev 
* commit '0313a0e9b786f9d5d83113d574bcc8f27f2206dc':
  TIF: TvInputHardwareManager puts multiple sink ports into audio patch
 2015-01-23 16:35:44 +00:00
Miao Wang
05d0d2418c am dbfcf3f8: Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev 
* commit 'dbfcf3f812c78d1e76c317b8f200488dcaea4d77':
  [Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic.
 2015-01-23 16:35:39 +00:00
Craig Mautner
daf2ef637d am c79a8ea0: (-s ours) Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c79a8ea0c4e1cb30c667f84276820f7e14bfb3b1':
  Resume home activity can skip resume and cause ANR. DO NOT MERGE
 2015-01-23 16:35:33 +00:00
Wonsik Kim
0313a0e9b7 Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev 2015-01-22 01:52:08 +00:00
Miao Wang
dbfcf3f812 Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev 2015-01-22 01:16:30 +00:00
Craig Mautner
c79a8ea0c4 Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev 2015-01-22 00:25:19 +00:00
Robert Greenwalt
ab42bbb902 Merge "Fix legacy request removal." into lmp-mr1-dev 2015-01-21 23:50:27 +00:00
Robert Greenwalt
7ca16ff8c6 Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 2015-01-21 23:49:12 +00:00
Andrew Solovay
63e822df58 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 
automerge: d4cf09d

* commit 'd4cf09d3a0f90d61386eb1713ef2ed4ade00c061':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:33:10 +00:00
Luan Nguyen
2b01cfbefc am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 8884eda 
automerge: de9bd40

* commit 'de9bd40e21696ceeffc67ec24e6e43975461bc60':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:31:44 +00:00
Andrew Solovay
d4cf09d3a0 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 
automerge: e628954

* commit 'e628954ea49da6a798879815d221f4d2d871e79a':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:22:45 +00:00
Luan Nguyen
de9bd40e21 am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 
automerge: 8884eda

* commit '8884edaaeb0375338f5cf6474c91c3f55f44a172':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:21:24 +00:00
Andrew Solovay
e628954ea4 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 
* commit '78f4342fac982a130a62dac2a459cef2a4c29f5a':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:10:59 +00:00
Luan Nguyen
8884edaaeb am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 
* commit 'f082f8980e742e9a60aeb91271caff38e10cf0a8':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:10:55 +00:00
louis_chang
b4d43538d7 Resume home activity can skip resume and cause ANR. DO NOT MERGE 
Symptom:
In some scenario, there might have two home tasks
in the home stack. If the top home task was finishing
and expected to return to home stack, no activity
will resume.

Root Cause:
Unable to perform resumeHomeStackTask() because the
resumeTopActivityLocked() has been prevented to invoke
recursively.

Solution:
Just resume the next activity if already in home stack

Change-Id: I24ecbcac6cee4ddbd90cdd27c4f4915cffb9b354
 2015-01-21 21:38:31 +00:00
Miao Wang
b590b354ef [Renderscript] Add check for Allocation.copyTo(Array) and 
Fix the input allocation type check for Histogram Intrinsic.

Bug: 19035242
Change-Id: I0ef2672bf816854db90fc92dc9ef51d1d231c246
 2015-01-21 21:17:19 +00:00
Alan Viverette
b74155cf01 Avoid ripple buffer creation for empty bounds 
Bug: 19068439
Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
 2015-01-21 12:30:49 -08:00
Andrew Solovay
78f4342fac Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 2015-01-21 19:20:58 +00:00
Dianne Hackborn
213269599b Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 2015-01-21 18:41:38 +00:00
Svetoslav
76ff4dd0de AlertActivity now behaves as a dialog for accessibility purposes. 
AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.

bug:18865632

Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
 2015-01-21 18:28:03 +00:00
Dianne Hackborn
455625e298 Work on issue #18201239: ANRs in com.google.process.gapps: 
Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService

Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.

Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
 2015-01-21 09:55:13 -08:00
Luan Nguyen
f082f8980e Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 2015-01-21 16:19:20 +00:00
Kenny Guy
06ab0ca481 Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev 2015-01-21 16:13:24 +00:00
Luan Nguyen
46e804d2a7 docs: Fix conditional in ambient mode check method (18832168). 
Fix issue with non existent variable (18832287).
Fix issue with outdated instructions (18832293).
Fix issue with misleading time tick (18832171).

bug: 18832168
bug: 18832171
bug: 18832287
bug: 18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
 2015-01-21 08:00:45 -08:00
Geoff Mendal
af69fcd0bd Import translations. DO NOT MERGE 
Change-Id: I3d03c8e758bc8ecfe8e8b789fcfeab386e7eec9a
Auto-generated-cl: translation import
 2015-01-21 08:15:11 -06:00
Jinsuk Kim
f23829d64f Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 2015-01-21 02:10:54 +00:00
Jinsuk Kim
337ce19bef CEC: Switch active input after routing control 
Makes sure the previous HDMI input gets switched to upon receiving
<Inactive Source> from the current active source device.

Bug: 18986597
Change-Id: I7120e81d75b5fd4cafd4b483e9b232b96e50f597
 2015-01-21 09:38:33 +09:00
Dianne Hackborn
66f8d9bb69 Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev 2015-01-21 00:23:53 +00:00
Andrew Solovay
f92dbe0115 docs: WebView security notes for apps on pre-K devices 
Added paragraph describing security precautions for apps that use
WebView on devices running versions older than Android 4.4. See first
comment for doc stage location.

bug: 19075466
Change-Id: I69937d8dfc37ec1ba693f969500b9dc7404c4635
 2015-01-20 16:10:07 -08:00
Craig Mautner
d22c8d9961 Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 2015-01-20 23:07:56 +00:00
Craig Mautner
088bf3a37a Merge "More debugging for bug 17721767" into lmp-mr1-dev 2015-01-20 22:57:42 +00:00
Dianne Hackborn
cff1bbf46c Fix issue #19020826: Including timing issues in ANR reason breaks clustering 
Also improve service ANR debugging.

Change-Id: I2118ef2811ca3ba676c110639f58d5c21abfb8eb
 2015-01-20 14:56:09 -08:00
Christopher Tate
77c96dd80a Merge "Don't launch broadcast receiver processes during boot" into lmp-mr1-dev 2015-01-20 22:55:16 +00:00
Christopher Tate
14c33f6a71 Merge "Don't try to launch broadcast receivers during boot" into lmp-mr1-dev 2015-01-20 22:54:53 +00:00
Sanket Padawe
e54e760477 Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev 2015-01-20 22:50:03 +00:00
Sanket Padawe
201cc00947 Fixed a crash in TelephonyManager while calling getDeviceID() 
Bug: 19056848
Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
 2015-01-20 14:40:14 -08:00
Jinsuk Kim
054f2656a1 Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 2015-01-20 22:39:53 +00:00
Craig Mautner
ea343e5f67 Revert "Remove debugging and skip InputMethod windows" 
This reverts commit 668cae1d4724cf794571f1ee2a3e896984b97db7.

Too soon. I need this for debug.

Change-Id: Ibeaec0139f511cf389049bdb7dae368a7bd8186b
 2015-01-20 22:35:25 +00:00
Craig Mautner
d9a79b5ba9 Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev 2015-01-20 22:34:01 +00:00
Jinsuk Kim
28d2a693ef Mark TimeUnit as @SystemApi 
Bug: 18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
 2015-01-21 07:33:40 +09:00
Christopher Tate
0721a94630 Don't try to launch broadcast receivers during boot 
It turns out that sysUI visibility / interactivity is racing with
boot, and it's possible in some circumstances for the user to start
the secure camera swipe gesture before formal boot-completed.  Make
sure we only send the camera-related broadcast to registered
receivers in that case, otherwise we'll implicitly be asking to
launch other apps before boot, which is forbidden.

Bug 19060618

Change-Id: I7fcf13b5af7b2edfbb4aac06ef04a0fde2c6a0f7
 2015-01-20 14:29:22 -08:00
Craig Mautner
cbb286b859 Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 2015-01-20 22:26:11 +00:00
Christopher Tate
267603f3bb Don't launch broadcast receiver processes during boot 
Broadcasts that might be sent before the boot process has completed must
be restricted to registered receivers, at least while still in the
middle of booting.

Bug 19060618

Change-Id: Ib4e0990cf252f34344f7a0bd19a0e72919013e0f
 2015-01-20 14:21:21 -08:00
Craig Mautner
0c4d81cf13 Do not defer removal for empty tasks or activities 
It is possible for empty activities to be leaked if their last
window is removed before animations finish. This change keeps tasks
and activities from having removal deferred if they have no windows.

Fixes bug 19047432

Change-Id: If6562f46bbfcac9ba987e2c834a1d55a9a8f3766
 2015-01-20 13:57:27 -08:00
Adam Lesinski
aee7225e34 Merge "Process base APK" into lmp-mr1-dev 2015-01-20 21:41:46 +00:00
Christopher Tate
7651dcb921 Merge "Don't write widget metadata to backup unless it's new/changed" into lmp-mr1-dev 2015-01-20 21:24:00 +00:00
Wale Ogunwale
92dd1abef4 Update restored task uid to match the package uid on current device. 
The uid on the task we are restoring from another device are
meaningless on the current device. Change updates the uid of any
task we restore to match the package uid on the current device.

Bug: 19014377
Change-Id: I285fbe9f509cae3d2e9a212a59e88f34b4db20e5
 2015-01-20 12:52:07 -08:00
Kenny Guy
2b43c73e66 Only hide cross profile disclosure when showing resolver. 
Hiding the cross profile discoloure for all system apps
also meant it wasn't shown for CALL_PRIVILEGED intents.

Bug: 18702461
Change-Id: I8129bc4b07573b547aefe2dbcc6938a60305c216
 2015-01-20 19:27:38 +00:00
Craig Mautner
94ab46659b More debugging for bug 17721767 
Narrow down why GEL is being resumed instead of the top stack.

Change-Id: I79c0be4adf0ccee30e1a5aa4308ee91148f239fa
 2015-01-20 10:52:53 -08:00
Ricardo Cervera
7c002d75b6 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 
automerge: 47e274c

* commit '47e274c56a0662e3e2aef24f2a458cc078e70fd8':
 2015-01-20 18:32:22 +00:00