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

176887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
duho.ro
2aa105d81e am 7c614473: am 36ccf75b: am fb754252: UICC : discard language setting of SIM 
* commit '7c6144730b347fa93ce124cbf5244f5eaa2ca255':
  UICC : discard language setting of SIM
 2014-12-04 21:55:24 +00:00
Cheuksan Wang
412766a7d6 am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 
* commit '29ac679f9f85a68eca03c262e740d62f8af66797':
  new SMS/MMS carrier app API
 2014-12-04 21:55:19 +00:00
Craig Mautner
afca4dba31 Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev 2014-12-04 21:55:02 +00:00
Craig Mautner
9052862ebb Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev 2014-12-04 21:53:42 +00:00
Craig Mautner
799cb73029 Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev 2014-12-04 21:52:06 +00:00
John Reck
9fb42f0778 resolved conflicts for merge of a75b0ad3 to master 
Change-Id: I32a2d129c556407727ada909daa6470309d42499
 2014-12-04 13:51:41 -08:00
Craig Mautner
e0dc40c0f2 Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev 2014-12-04 21:50:46 +00:00
Craig Mautner
93d47b4c05 Merge "Avoid system server crash due to package removed" into lmp-mr1-dev 2014-12-04 21:50:15 +00:00
Mike Lockwood
75b2557725 am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize" 
* commit '448403b7a4b2126e79121482d1fb2894133dfa25':
  Dont call close in in BluetoothA2dp finalize
 2014-12-04 21:49:56 +00:00
Craig Mautner
435496e1ac am c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev 
* commit 'c2cae50b832753dea612db575c6d97b8d94eceea':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-04 21:49:50 +00:00
Craig Mautner
1d8b27bced am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev 
* commit '1289a3b2d3ae6ba67215d984c3302bfdcd69ae14':
  [ActivityManager] Fix NPE when start activity
 2014-12-04 21:49:44 +00:00
Jorim Jaggi
638e8068d2 am 9f44ea8f: am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev 
* commit '9f44ea8fbcee80816f4ce6eeca2568ccd06d5a15':
  Improve fling physics for recents
 2014-12-04 21:47:35 +00:00
Jorim Jaggi
b6d16dc53f am d3cf181d: am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev 
* commit 'd3cf181d57bb7d63ea8dc6834daf8e3c84f1c769':
  Fix rounded corners in bottom QS panel.
 2014-12-04 21:47:28 +00:00
Derek Sollenberger
203c817180 am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev 
* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
  Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
 2014-12-04 21:46:39 +00:00
Christoph Studer
51347595a3 am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev 
* commit 'a6ecb61ee7a87af7153f11289d7df1eb6f1beb67':
  RankingHelper: Remove STOPSHIP
 2014-12-04 21:46:32 +00:00
Deepanshu Gupta
9c403d8513 am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '43d0e67573e8122d9e75accb00eaa453e2755713':
  Ensure that RandomAccessFile is not leaked.
 2014-12-04 21:46:26 +00:00
Deepanshu Gupta
940a1e563f am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '52a60ff6366a4f5cf1ed9697b7cebd6f9300de2b':
  Fix AnalogClock rendering
 2014-12-04 21:46:20 +00:00
Deepanshu Gupta
028df22fd7 am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev 
* commit 'c16d1448bb139384cc86d14d9412ffe1a62817c8':
  Fix typos in previous bugfixes.
 2014-12-04 21:46:14 +00:00
Jinsuk Kim
4921676345 am 92a46272: am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev 
* commit '92a4627250d74264719eff3ade798a9f4480ed5a':
  CEC: Generate hotplug events upon adding listener
 2014-12-04 21:46:08 +00:00
Vinit Deshpande
f04e214a6b am aefb79b2: am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev 
* commit 'aefb79b2dd13047630ba455d5a3aec8084c1d954':
  Remove notification for SoftAP turned on
 2014-12-04 21:46:01 +00:00
Geoff Mendal
72142eb12a am c7d8a48b: (-s ours) am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c7d8a48bb01f3d6ffbf6a3f8f81e23dd0b806562':
  Import translations. DO NOT MERGE
 2014-12-04 21:45:55 +00:00
Geoff Mendal
9088853d70 am c7b52575: (-s ours) am a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c7b52575212ca00f7c52222f1129a0f64e061095':
  Import translations. DO NOT MERGE
 2014-12-04 21:45:48 +00:00
Geoff Mendal
91b95c9612 am 5d1f6880: (-s ours) am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '5d1f68803488677637b1f383d0f1162a896a9684':
  Import translations. DO NOT MERGE
 2014-12-04 21:45:42 +00:00
Erik Kline
180a30aa57 am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev 
* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.
 2014-12-04 21:45:33 +00:00
John Spurlock
c82144fd8f am 95931270: am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev 
* commit '959312701f55c9d098403c332b88b5777daf4e4c':
  Doze: Don't block pickup pulses on a proximity check.
 2014-12-04 21:45:26 +00:00
Pavel Zhamaitsiak
10f47f9233 am 38916819: am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev 
* commit '38916819693a69fbc882ac509e60ef0b6419c5dc':
  IMS Call End Cause Additions
 2014-12-04 21:45:21 +00:00
Craig Mautner
c2cae50b83 Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev 2014-12-04 21:45:21 +00:00
duho.ro
7c6144730b am 36ccf75b: am fb754252: UICC : discard language setting of SIM 
* commit '36ccf75bb26604786f1d99ab1703ba01f8c3290c':
  UICC : discard language setting of SIM
 2014-12-04 21:45:14 +00:00
Cheuksan Wang
29ac679f9f am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 
* commit 'dba26aa2e793b037839c608319534b100d2c3dbe':
  new SMS/MMS carrier app API
 2014-12-04 21:45:08 +00:00
Craig Mautner
1289a3b2d3 Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev 2014-12-04 21:44:39 +00:00
Mike Lockwood
448403b7a4 Merge "Dont call close in in BluetoothA2dp finalize" 2014-12-04 21:41:13 +00:00
John Reck
a75b0ad384 resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp 
Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
 2014-12-04 13:41:04 -08:00
louis_chang
1864a509b0 [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-04 13:35:02 -08:00
younghwan1.kim
bc0975b3af 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-04 13:32:41 -08:00
louis_chang
71e737c8e8 [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-04 13:30:12 -08:00
Kazuki Nakayama
8920e1cabb Reset killedByAm flag at attachApplicationLocked 
Cherry picked from aosp.

Fixes bug 18593309.

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-12-04 13:28:10 -08:00
Winson Chung
e1a96f7fe2 am 1c88fc00: am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* commit '1c88fc009fb3f7a3b5f085abb6a40cf4d845d662':
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 21:24:02 +00:00
Jim Miller
1568aa6ccd am d205d407: am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 
* commit 'd205d407b44b3218579401be4960eda79ce32f67':
  Stop keyguard from spamming the log
 2014-12-04 21:23:58 +00:00
xinhe
a766b75103 am c377c360: am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit 'c377c360e971b07ccb3c2937f23168c88f426640':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 21:23:53 +00:00
Wink Saville
6abe46c472 am 58a3561f: am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 
* commit '58a3561f74204a3c4cf913169ebc990ca9c0db28':
  Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
 2014-12-04 21:23:48 +00:00
Christopher Tate
1d94907c77 am dff55807: am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 
* commit 'dff55807117f515ff3f8878ed268a20c1fb9e4a5':
  Adjust wallpaper-restore acceptance criteria
 2014-12-04 21:23:43 +00:00
Winson Chung
1c88fc009f am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* commit '4eb896ef011a8ecfe32f3b4300a42e0cc8b162a8':
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 21:18:01 +00:00
Jim Miller
d205d407b4 am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 
* commit 'f2b934b42be772d457b3f6e16c95aad1056c502e':
  Stop keyguard from spamming the log
 2014-12-04 21:17:55 +00:00
xinhe
c377c360e9 am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit '9a4472bf45044082f4fa6d906530f3640761676a':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 21:17:50 +00:00
Wink Saville
58a3561f74 am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 
* commit '0304c529b6a166547aaf104a46bc876780ba7416':
  Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
 2014-12-04 21:17:43 +00:00
Christopher Tate
dff5580711 am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 
* commit 'e808d2df764ca19c94bdaf5f9b5cd9a311046d98':
  Adjust wallpaper-restore acceptance criteria
 2014-12-04 21:17:37 +00:00
Dan Sandler
f5ba6bdafa RTL support for Lollipop Land. 
Since the game randomly flips horizontally anyway, forcing
the game view to LTR fixes the coordinate math without
affecting gameplay. (The score view did need to move to
start instead of left, however.)

Bug: 18628150
Change-Id: I7cf8bd1e2b9a2316d30e17a9251173598c687c2b
 2014-12-04 16:07:30 -05:00
Joe Fernandez
ae80fd42a4 am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs 
* commit 'f5aa675294ef1c622ec369450e2b0bbaa839db6d':
  docs: Fixes for App Indexing training class
 2014-12-04 21:06:21 +00:00
louis_chang
cd5d198d7e [ActivityManager] Fix NPE when start activity 
Cherry picked from aosp.

Fixes bug 18593457.

Symptom:
NPE occurs in line 1184 (resultStack.sendActivityResultLocked)
because resultStack is null.

Root cause:
When starting activity with FLAG_ACTIVITY_FORWARD_RESULT flag,
the resultRecord could be updated, but the resultStack is not
updated as well. In that case, the resultStack is still be
null. The exception will occurs if the activity is not
granted to launch due to permission denied.

Solution:
Update resultStack when resultRecord updates.

Change-Id: I91634e4f713c2e8dbd1a71f358a8fd9beed83ec7
 2014-12-04 13:06:05 -08:00
Joe Fernandez
f5aa675294 am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs 
* commit '709df4fa2600d1d2ee2f686097e1c92b52b58d19':
  docs: Fixes for App Indexing training class
 2014-12-04 21:00:30 +00:00