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

24627 Commits

Author SHA1 Message Date
Erik Kline
8686e750a5 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 147cf4b automerge: 4f36150 
automerge: 61b07b4

* commit '61b07b4016ebdbfe7215c0cc03fd65ddf55c6703':
  Log interface name and uid when filtering a blocked network.
 2015-01-22 07:22:19 +00:00
Erik Kline
61b07b4016 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 147cf4b 
automerge: 4f36150

* commit '4f3615036db441c4a099dc789ebcdf641ac5a987':
  Log interface name and uid when filtering a blocked network.
 2015-01-22 07:18:00 +00:00
Erik Kline
4f3615036d Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 
automerge: 147cf4b

* commit '147cf4b8c4345f2d086251313583888356317d2d':
  Log interface name and uid when filtering a blocked network.
 2015-01-22 07:10:58 +00:00
Erik Kline
147cf4b8c4 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 2015-01-22 07:07:36 +00:00
Jinsuk Kim
2b98b00062 am c988e15e: Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev automerge: 7de1ed9 
automerge: 8175e7b

* commit '8175e7b3640b9aa0df192c2abf59ba124486df7b':
  CEC: Let playback device switch TV input after bootup
 2015-01-22 02:31:36 +00:00
Jinsuk Kim
8175e7b364 am c988e15e: Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev automerge: 7de1ed9 
* commit 'c988e15e1ff8e85981e7cd3347d759b37be1cf2f':
  CEC: Let playback device switch TV input after bootup
 2015-01-22 02:27:26 +00:00
Jinsuk Kim
c988e15e1f Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev 
automerge: 7de1ed9

* commit '7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d':
  CEC: Let playback device switch TV input after bootup
 2015-01-22 02:21:59 +00:00
Jinsuk Kim
7de1ed9d63 Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev 2015-01-22 02:19:37 +00:00
Wonsik Kim
b3716b344f am 67add1d2: Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev automerge: 0313a0e 
automerge: a80c076

* commit 'a80c07633b179240c0a80168bd1de17dce84d5df':
  TIF: TvInputHardwareManager puts multiple sink ports into audio patch
 2015-01-22 02:06:54 +00:00
Wonsik Kim
a80c07633b am 67add1d2: Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev automerge: 0313a0e 
* commit '67add1d26257eb298918a6e2c75f21afd59dadba':
  TIF: TvInputHardwareManager puts multiple sink ports into audio patch
 2015-01-22 02:02:39 +00:00
Wonsik Kim
67add1d262 Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev 
automerge: 0313a0e

* commit '0313a0e9b786f9d5d83113d574bcc8f27f2206dc':
  TIF: TvInputHardwareManager puts multiple sink ports into audio patch
 2015-01-22 01:54:49 +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
Craig Mautner
d56352dbcb am c79a8ea0: 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-22 00:29:56 +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
8efe9ff6e9 am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev automerge: 9e7cb40 
automerge: ed25274

* commit 'ed25274e719fc1a2f40aee0d31dce89caf47cc07':
  Fix legacy request removal.
 2015-01-22 00:10:54 +00:00
Robert Greenwalt
bea29888c8 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev automerge: 0343e1a 
automerge: 8379688

* commit '8379688475b9196a298f2fc7c3b554c866b40ec3':
  Rerun entitlementcheck on sim change.
 2015-01-22 00:09:28 +00:00
Robert Greenwalt
ed25274e71 am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev 
automerge: 9e7cb40

* commit '9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b':
  Fix legacy request removal.
 2015-01-22 00:00:43 +00:00
Robert Greenwalt
8379688475 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
automerge: 0343e1a

* commit '0343e1a7042e34589a52b4bf4a0afdcb2d51fc7d':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:59:09 +00:00
Robert Greenwalt
9e7cb40ddf am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev 
* commit 'ab42bbb9024d10579a913049147f6fc25b57df83':
  Fix legacy request removal.
 2015-01-21 23:56:07 +00:00
Robert Greenwalt
0343e1a704 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:56:02 +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
Dianne Hackborn
4da9bbbbd9 Merge "Bring back voice interaction APIs." 2015-01-21 23:45:55 +00:00
Dianne Hackborn
4e106cedfe Bring back voice interaction APIs. 
Change-Id: I6039d7c0b188ac342441c56f7d19994b9a80ba17
 2015-01-21 15:07:20 -08:00
Jinsuk Kim
8913a0e1e8 CEC: Let playback device switch TV input after bootup 
Saves users from having to switch TV input manually to a playback device
after it boots up.

Bug: 19046176
Change-Id: I0a4fae1036138ce2e19cbac9fdd9dda41bdcf89f
 2015-01-21 22:47:10 +00:00
Craig Mautner
7b15552692 Merge "Refactor removeApp and removeTask for last removals." 2015-01-21 22:19:25 +00:00
Craig Mautner
e3119b7d35 Refactor removeApp and removeTask for last removals. 
Move app token removal to the AppWindowToken class so cleanup can
be done locally. Move task removal to the Task class so cleanup can
be done locally. Call task removal when the last app is removed.
Merge actions done prior to method calls into methods.

Fixes bug 18088522 item #12.

Change-Id: I5ce85d2bb309ceb82bd7404e27a56a7c31cd7359
 2015-01-21 13:57:24 -08: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
Dianne Hackborn
4b94649ce3 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 automerge: 5346a21 
automerge: f6b4b1a

* commit 'f6b4b1a43253d5ea94763cf9750224c7b7b618c0':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 19:00:55 +00:00
Dianne Hackborn
f6b4b1a432 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 
automerge: 5346a21

* commit '5346a21bad95796611760d40c1540d1659038216':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:55:12 +00:00
Dianne Hackborn
5346a21bad Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 
automerge: 2132695

* commit '213269599bdec3d83d3d811f5e8f62b9fd8d245c':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:47:11 +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
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