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

162761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
3c556895ed Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev 
automerge: 1a5ac5b

* commit '1a5ac5b415fea8098686aa08bffc6da3ada31938':
  Show connect dialog when selecting secure QS wifi
 2015-01-22 14:14:41 +00:00
Jason Monk
1a5ac5b415 Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev 2015-01-22 14:11:53 +00:00
Nicolas Prevot
3677117d2b Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev 
automerge: ad44f74

* commit 'ad44f7448f0b9aa672cad21300f436e369c8105d':
  Never set "Work" or "Personal apps" as prefered activities.
 2015-01-22 10:24:49 +00:00
Nicolas Prevot
ad44f7448f Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev 2015-01-22 10:22:08 +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
Jim Miller
0ac8dfa37b Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev 
automerge: ffd1a49

* commit 'ffd1a49c0b8e442aea73c4f5336ea486492981f6':
  Clarify getTrustAgentConfiguration() documentation.
 2015-01-22 02:40:15 +00:00
Jim Miller
ffd1a49c0b Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev 2015-01-22 02:37:39 +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
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
Miao Wang
a710b839a2 Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev 
automerge: dbfcf3f

* commit 'dbfcf3f812c78d1e76c317b8f200488dcaea4d77':
  [Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic.
 2015-01-22 01:19:28 +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
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
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
Andrew Solovay
a1838a9d78 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d 
automerge: 63e822d

* commit '63e822df58b056e35a8a405103b53a2a033c7d33':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:40:51 +00:00
Luan Nguyen
349e3b5ad1 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 
automerge: 2b01cfb

* commit '2b01cfbefcdb07640d61f09a92a26c7d3f302773':
  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:39:29 +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
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
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
e6e216c48e Avoid ripple buffer creation for empty bounds 
automerge: b74155c

* commit 'b74155cf01f959fc9b7909de5a22806ad519f7c9':
  Avoid ripple buffer creation for empty bounds
 2015-01-21 21:02:58 +00:00
Jim Miller
b5db57a27d Clarify getTrustAgentConfiguration() documentation. 
Fixes bug 18983802

Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
 2015-01-21 21:01:02 +00:00
Jason Monk
17f3c3f4fb Show connect dialog when selecting secure QS wifi 
Use startSettingsActivity (QSTileHost) to make sure we use the right flags
and get the keyguard out of the way so the user always sees the
connect dialog for secure networks when they are sent to settings.

Bug: 18987307
Change-Id: I9027393ab8743e6dfe702221cb3bc1bb4e213708
 2015-01-21 20:58:47 +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
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
Svetoslav
03944ce664 AlertActivity now behaves as a dialog for accessibility purposes. 
automerge: 76ff4dd

* commit '76ff4dd0de8d9747b9341f064dd270c5762705c6':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:31:46 +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
Nicolas Prevot
daf92066db Never set "Work" or "Personal apps" as prefered activities. 
In ResolverActivity: when the user chooses work or personal:
Do not set them as prefered activities.

BUG:19091836

Change-Id: Ibe0081eb16e58cc25decb3f25b7fd50b5403d5fc
 2015-01-21 17:53:11 +00:00
Geoff Mendal
bae67d3030 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-21 16:32:07 +00: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
11c4cc196d Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev 
automerge: 06ab0ca

* commit '06ab0ca4812450ec297722957e18b34cbfa733b2':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:17:03 +00:00
Geoff Mendal
0b953a1267 Import translations. DO NOT MERGE 
Change-Id: Icfb7c61dc2e280254ec926c2b706ba2d7dd1273a
Auto-generated-cl: translation import
 2015-01-21 08:14:22 -08: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
45c5f9d195 Import translations. DO NOT MERGE 
automerge: af69fcd  -s ours

* commit 'af69fcd0bd4878145214dc16adbf5ef614e7f3a4':
  Import translations. DO NOT MERGE
 2015-01-21 14:19:37 +00: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