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

24747 Commits

Author SHA1 Message Date
Paul Jensen
c4c7231eb6 Clear VPN config when VPN disconnects. 
This ensures ConnectivityService.getVpnConfig() returns null after a
VPN disconnects.

bug:18640307
Change-Id: I2238eabaf665cad0a4f4258add57611f2b450089
 2015-01-21 18:08:15 +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
Craig Mautner
9ba23db50c Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" automerge: 247e828 automerge: ad55787 
automerge: 7748fd8

* commit '7748fd81350ba2db9864527281d62fbf02a90145':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
 2015-01-21 17:17:18 +00:00
Craig Mautner
7748fd8135 Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" automerge: 247e828 
automerge: ad55787

* commit 'ad55787db2f9e4b56a8406026566564d6aa08d5a':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
 2015-01-21 17:09:30 +00:00
Kenny Guy
a526a1e78c Flush and sync before calling JournaledFile.commit 
JournaledFile.commit on ext4 isn't atomic you need
to flush / sync before closing the file otherwise
you might end up with an empty file.

Bug: 19091744
Change-Id: Ia04784084053cc8ce338a13a61dc6d397610a006
 2015-01-21 16:52:01 +00:00
louis_chang
2d094e9477 [ActivityManager] No home activity resumed and cause 
key dispatch ANR

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 19:01:52 +08:00
Erik Kline
338317edd5 Log interface name and uid when filtering a blocked network. 
Bug: 18707263
Change-Id: Ide9a1670a97eae787b785933de0c80750c2b5601
 2015-01-21 12:02:11 +09:00
Jinsuk Kim
70523ec551 am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev automerge: f8d2f32 
automerge: 748e813

* commit '748e813ed7f9042eba6e64fced78e28b7c16327a':
  CEC: Switch active input after routing control
 2015-01-21 02:36:59 +00:00
Jinsuk Kim
748e813ed7 am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 
automerge: f8d2f32

* commit 'f8d2f3284f9613bc20967e19213573804ea0ab83':
  CEC: Switch active input after routing control
 2015-01-21 02:33:08 +00:00
Jinsuk Kim
f8d2f3284f am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 
* commit 'f23829d64ff6fdae6f8b1d2b0fbe3f2715b313d4':
  CEC: Switch active input after routing control
 2015-01-21 02:16:37 +00:00
Jinsuk Kim
f23829d64f Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 2015-01-21 02:10:54 +00:00
Dianne Hackborn
51ff482f02 Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev automerge: 66f8d9b automerge: 8781dbf 
automerge: 734f684

* commit '734f68439ed7e0fb6fbd521f961cebf31baf5b6d':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 01:10:18 +00:00
Dianne Hackborn
734f68439e Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev automerge: 66f8d9b 
automerge: 8781dbf

* commit '8781dbf3dfa79c39fc0410521dff04156fae876a':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 00:43:50 +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
8781dbf3df Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev 
automerge: 66f8d9b

* commit '66f8d9bb693d5e410ac6f6ba3029cf6c7dc2f104':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 00:27:47 +00: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
Craig Mautner
a30dc1709e am f1eb1cdc: am d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 
automerge: b880c75

* commit 'b880c75eeb48002169627a4b33dbafad3f047421':
  Revert "Remove debugging and skip InputMethod windows"
 2015-01-21 00:13:53 +00:00
Craig Mautner
b7dae3b565 am 1388342c: am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
automerge: 07d2f0c

* commit '07d2f0cff4d08bec4ff5ea22f9c42532f3c83e35':
  More debugging for bug 17721767
 2015-01-21 00:11:23 +00:00
Craig Mautner
b880c75eeb am f1eb1cdc: am d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 
* commit 'f1eb1cdc65376ea32ece4f7a4c750abe48c9f3c7':
  Revert "Remove debugging and skip InputMethod windows"
 2015-01-20 23:58:05 +00:00
Craig Mautner
07d2f0cff4 am 1388342c: am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
* commit '1388342c7f6e9c235d31b01edf3716e83fad3e64':
  More debugging for bug 17721767
 2015-01-20 23:58:00 +00:00
Craig Mautner
db370e1cba am 6673d09a: Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev automerge: d9a79b5 automerge: 03d7cc3 
* commit '6673d09a8a9bae0d5240d2fdd78b70b02e5af0a2':
  Remove debugging and skip InputMethod windows
 2015-01-20 23:24:43 +00:00
Craig Mautner
387f598ef9 resolved conflicts for merge of a3342991 to master 
Change-Id: I6a26297c6ea7c312d0d152243172fb5472444936
 2015-01-20 15:17:31 -08:00
Craig Mautner
f1eb1cdc65 am d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 
* commit 'd22c8d9961340ba1b7d7601d1c99e2557b6a9f0b':
  Revert "Remove debugging and skip InputMethod windows"
 2015-01-20 23:12:33 +00:00
Craig Mautner
1388342c7f am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
* commit '088bf3a37a329962efb5e5a42c82f32a2dab77fe':
  More debugging for bug 17721767
 2015-01-20 23:12:29 +00: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
Craig Mautner
6673d09a8a Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev automerge: d9a79b5 
automerge: 03d7cc3

* commit '03d7cc3c24e7d89d82394c9d0cfc8e0c3423687f':
  Remove debugging and skip InputMethod windows
 2015-01-20 22:45:50 +00:00
Craig Mautner
a3342991a7 am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 
automerge: 07317da

* commit '07317da6834cc35fe8fad519bb60f15ba68bcd48':
  Do not defer removal for empty tasks or activities
 2015-01-20 22:43:32 +00:00
Craig Mautner
03d7cc3c24 Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev 
automerge: d9a79b5

* commit 'd9a79b5ba9934429289a634bdd4ad1a375484184':
  Remove debugging and skip InputMethod windows
 2015-01-20 22:35:57 +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
Craig Mautner
07317da683 am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 
* commit 'cbb286b8594c56161f2765023a73d8200e426f9b':
  Do not defer removal for empty tasks or activities
 2015-01-20 22:32:16 +00: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
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
Christopher Tate
0fa1d70ab1 am a9c122af: Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev automerge: 7651dcb automerge: 5afc62c 
* commit 'a9c122af60621597f1d008c8a283074309383aac':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:49:55 +00:00
Christopher Tate
a9c122af60 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev automerge: 7651dcb 
automerge: 5afc62c

* commit '5afc62cd39403c12a253101b12c52f440843bdaf':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:45:08 +00:00
Christopher Tate
5afc62cd39 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev 
automerge: 7651dcb

* commit '7651dcb92193a5a970a2554e067ec14d6fcad802':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:26:56 +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
885e727ab4 am f5f54dd6: am 92dd1abe: Update restored task uid to match the package uid on current device. automerge: 7fd985f 
* commit 'f5f54dd69122bc07ea0a25b8d98b9048cbe4582f':
  Update restored task uid to match the package uid on current device.
 2015-01-20 21:17:05 +00:00
Wale Ogunwale
f5f54dd691 am 92dd1abe: Update restored task uid to match the package uid on current device. 
automerge: 7fd985f

* commit '7fd985f2c69f600f7530311ac9b7c9af196dc0e0':
  Update restored task uid to match the package uid on current device.
 2015-01-20 21:10:01 +00:00
Wale Ogunwale
7fd985f2c6 am 92dd1abe: Update restored task uid to match the package uid on current device. 
* commit '92dd1abef4c0a22db40c5f7bbd100e6b471a1ad3':
  Update restored task uid to match the package uid on current device.
 2015-01-20 20:58:26 +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
RoboErik
c8f92d176e Persist safe MediaSession intents across reboots 
Persist a MediaSession's PendingIntent across reboots so long as it
is for the same package as the MediaSession that created it.

bug:15575138
Change-Id: I34144a90d1f9c320e7509cb9c64281b48dac9140
 2015-01-20 11:39:28 -08: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
Todd Kennedy
4900bf9d82 Expose new binder call createStackOnDisplay() 
Creates a new, empty ActivityStack on a display. Use the binder call to
launch an activity on said stack.

Bug: 19001243
Change-Id: I0f04e8f2703bcc706f58e75333869fb35f6b1ee9
 2015-01-20 10:51:49 -08:00
Wonsik Kim
b2b85f9576 TIF: TvInputHardwareManager puts multiple sink ports into audio patch 
Bug: 18823504
Change-Id: Id1dfe6c87bb26a8cb3ffafae8b256fa9e87d9d8c
 2015-01-20 06:40:25 +00:00
Jinsuk Kim
f614a9f7ac am 1951fc36: am d38f077b: am 5b8cb00b: CEC: Process new options for CEC/MHL HAL 
* commit '1951fc3667eb5216500cfcc63c1bc3506759e086':
  CEC: Process new options for CEC/MHL HAL
 2015-01-19 02:58:40 +00:00
Jinsuk Kim
22443c94a7 am a73cbece: am 4d37a358: am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 
* commit 'a73cbecef2367fba708e1ed159a578c5117ca3dd':
  CEC: Make TV try to allocate logical address 0 first
 2015-01-19 02:58:35 +00:00
Jinsuk Kim
1951fc3667 am d38f077b: am 5b8cb00b: CEC: Process new options for CEC/MHL HAL 
* commit 'd38f077b10f1d6885834805bed1ec093f6ea8fe0':
  CEC: Process new options for CEC/MHL HAL
 2015-01-19 02:53:19 +00:00