153580 Commits

Author SHA1 Message Date
Sailesh Nepal
9bcda32475 am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev
* commit '7461b5a019dca6e02f1ddba0f75a6548e40fb632':
  Adding support for Cdma conference calling.
2014-09-26 01:06:11 +00:00
Adam Lesinski
9c235eaa35 am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev
* commit '0a6c5ea412bc1e49aa1e98a6a3fe268081883d4a':
  AAPT: Fix issue with synthesized resource not actually showing up
2014-09-26 01:06:06 +00:00
Martijn Coenen
56a3e67433 Add hidden API to disable NFC (optional persist).
Bug: 17298769
Change-Id: I1fa59592a34f1207731dc75d2e548b3e614d94f5
2014-09-25 18:02:27 -07:00
Craig Mautner
8828d86e79 DO NOT MERGE Fix race condition between binder deaths
If a Binder dies there is a race between activity manager and window
manager to see who can handle the binderDied call first. If the
activity manager wins the race it will remove the activity and task
but leave the windows around. Until the WindowState.binderDied call
is made and all animation is complete the windows will try to access
the task that they were associated with.

This fix removes the windows of an activity when the activity is
removed. It also defers removal of the activity and task until
exiting windows have completed their animation.

Fixes bug 17031518.

Change-Id: Idf52f55c5feb0cad4e3664ef2eae5b7e95bbf490
(cherry picked from commit 5acd163b828d5b26408eb3a7904d750a1570239e)
2014-09-26 01:01:42 +00:00
Deepanshu Gupta
04861ed488 am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '91043364b95fe58225437e2220d497ef6e33edf6':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:59:08 +00:00
Deepanshu Gupta
f103317499 am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '93b185e39c5e6a90d413ffa5a2eea740feb7364b':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:58:23 +00:00
Deepanshu Gupta
9fcacf52d0 am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'a6e2f22666db39df527cf6698abc2420c208f02c':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:58:18 +00:00
Sailesh Nepal
e6ae3fde43 Merge "Adding support for Cdma conference calling." into lmp-dev 2014-09-26 00:56:10 +00:00
Philip Nowell
d561913798 Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
Change-Id: I8b5ac84431d378f0e43be8d19920fd6ba335ebc6
2014-09-26 00:54:32 +00:00
Adam Lesinski
663a52d68a Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev 2014-09-26 00:51:36 +00:00
Dianne Hackborn
017c6a28be Work on issue #17656716: Unhandled exception in Window Manager
Create descriptive errors when sending unreasonably large
parcels through IPC.

Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
2014-09-25 17:48:44 -07:00
Deepanshu Gupta
a39b3b25b9 am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '08523e680e1ec1e4ec521c7e732e60fd85f553a4':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:48:26 +00:00
Deepanshu Gupta
a6e2f22666 am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '14ffff154f974bb169b3449ad24c508c836c670c':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:47:02 +00:00
Deepanshu Gupta
91043364b9 am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '52be792bad7cbd059daab02a23e28ef1df61f2ce':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:46:07 +00:00
Deepanshu Gupta
93b185e39c am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '363f4d4e2a53774b7b7c1ea995fc912291f5b84e':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:45:42 +00:00
Deepanshu Gupta
52be792bad am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '27d3b9264e2dcfb86400a60891a5e39cdf027d55':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:36:41 +00:00
Deepanshu Gupta
14ffff154f am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'c8cbff8bdc6c8e61a177eeb1aa728038e0aa86dd':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:35:59 +00:00
Deepanshu Gupta
ac892f688f am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '803a59cae71f8b5a76a48c73579ee6d3d34a78f7':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:34:44 +00:00
Deepanshu Gupta
363f4d4e2a am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '8bf221bd706a1bcb18f2c14cacbe4edbbc0a3a61':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:34:21 +00:00
Deepanshu Gupta
08523e680e am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '43214e0c19c13acbf1ecd714167abf03283d54ef':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 00:34:13 +00:00
Adam Powell
3f1ead4859 am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
* commit '11133a783a0e7b0fc0d725f2d4cd858d2a51ab6e':
  Always show the name of the last used Home app in ResolverActivity
2014-09-26 00:30:50 +00:00
Adam Powell
4967a73816 am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
* commit 'da7f9bab0206c237f3d70b3b23eeaab41f478eb1':
  Always show the name of the last used Home app in ResolverActivity
2014-09-26 00:16:26 +00:00
John Spurlock
9d1d07551b Shorten the zen supertoast visible duration.
Bug:16215680
Change-Id: I7ac8e9637b7bf8eae55b0902c60ddc9d513f20a3
2014-09-25 20:14:41 -04:00
Jinsuk Kim
4834b733f1 Merge "CEC: Send keys to active routing path" into lmp-mr1-dev 2014-09-26 00:13:55 +00:00
Dianne Hackborn
aa219dd7e9 am 801fd360: am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev
* commit '801fd36026b3f355fde91e30c7698a5ff71a5569':
  Fix issue #17661444: Persistent service not automatically restarted
2014-09-26 00:10:00 +00:00
Adam Powell
66f5a13f92 Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 2014-09-26 00:07:31 +00:00
Dianne Hackborn
1d5024039d am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev
* commit 'fcc42e8f3375a35dfc92af41fe9303359af84626':
  Fix issue #17661444: Persistent service not automatically restarted
2014-09-26 00:00:07 +00:00
Svetoslav
3f92ffc369 Invalid active window if temporary disabling accessibility for test tools.
If accessibility is enabled and a test tool based on the accessibility APIs
connects to the system we suspend the current accessibility services while
the tool is running (to avoid inteference as the tool is such a service) and
after the tool disconnects we restore the accessibility state. The issue is
that when clearing the accessibility state we were also wrongly clearing the
active window. We are now careful to not clear the active window in such a
case.

It is also possible that the active window was never initilaized before the
tool is run so now it is lazily loaded such that if we do not know which one
it is, we get the one the has input focus. The definition of an active window
is the one that has input focus or the user is touching.

bug:17663432

Change-Id: I8868866a5126c590d3bddad099ababb97978227a
2014-09-25 16:57:11 -07:00
Adam Powell
a35c77aea6 Always show the name of the last used Home app in ResolverActivity
Bug 17629220

Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
2014-09-25 16:54:41 -07:00
Dianne Hackborn
f3ac946317 Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev 2014-09-25 23:53:14 +00:00
Svetoslav
66bc567805 am 37b75fdd: am 48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev
* commit '37b75fddfda13c2a407f7b4cce1803b4078293dc':
  Accessibility in bad state after using SDK tool uiautomatorviewer.
2014-09-25 23:48:32 +00:00
Dianne Hackborn
2ca21efdde Fix issue #17661444: Persistent service not automatically restarted
The code to recover when running processes are removed from the
LRU list turned up an existing problem where we would remove a
persistent process from the LRU list, making it more obvious.

Now it is fixed.

Change-Id: I94ccb924b3e5649b2819d3392b6f6c9c725dc903
2014-09-25 16:46:50 -07:00
Svetoslav
5118c08ca1 am 48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev
* commit '48ccf04368f65f7988bb589f9c29f94c77bbd549':
  Accessibility in bad state after using SDK tool uiautomatorviewer.
2014-09-25 23:37:32 +00:00
Jesse Hall
083b84cf88 bootanimation: allow animation to specify background color
Some OEMs want to have a bootanimation (or parts of it) displayed on a
color other than black. They currently just use full-screen frames for
that, which wastes lots of memory and bandwidth. This change allows
each part of the animation to specify a background color that will be
applied outside of the frame images; if unspecified the background
will be black as it is now.

Bug: 16635599
Change-Id: Ibf008fc75c5aad891c86ba9e4ec0879b7a61b8bd
2014-09-25 23:37:12 +00:00
Svetoslav
471157821f Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev 2014-09-25 23:27:01 +00:00
Junda Liu
8aa0aa538f Update api/current.txt to unhide APIs by ag/554960
Bug: b/17639966
Change-Id: Ic11f362b170cf6fa16ce16a606c47f045bee9900
2014-09-25 16:04:15 -07:00
Deepanshu Gupta
803a59cae7 Fix error when using list as actionBarNavMode. [DO NOT MERGE]
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
2014-09-25 23:01:38 +00:00
Deepanshu Gupta
c8cbff8bdc Fix error when using list as actionBarNavMode. [DO NOT MERGE]
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
2014-09-25 23:01:08 +00:00
Deepanshu Gupta
43214e0c19 Fix error when using list as actionBarNavMode. [DO NOT MERGE]
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
2014-09-25 23:00:44 +00:00
Deepanshu Gupta
8bf221bd70 Fix error when using list as actionBarNavMode. [DO NOT MERGE]
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
2014-09-25 23:00:17 +00:00
Deepanshu Gupta
27d3b9264e Fix error when using list as actionBarNavMode. [DO NOT MERGE]
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
2014-09-25 22:59:58 +00:00
Tsuwei Chen
7bf6114c08 am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
* commit 'b2ae0d6f320d6f11f31cc82b03ac0fdf36220cc1':
  Fix an incorrect behavior that failed AT&T privacy test.
2014-09-25 22:56:43 +00:00
Adrian Roos
f2be7170bf am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
* commit 'a2e1e2ca20dba8d163223364b82861b84d180600':
  Ensure that setting an empty password clears it
2014-09-25 22:56:39 +00:00
Eino-Ville Talvala
c043b87d48 am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
* commit 'eeb44d4a77d5dd5050a25cc622bd5e6869e69e14':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.
2014-09-25 22:56:36 +00:00
Svetoslav
dd81183bbe Accessibility in bad state after using SDK tool uiautomatorviewer.
The UiAutormator tool is a part of the SDK. If it is run while
accessibility is enabled it stops all accessibility services
as it is an accessibility service itself to avoid interference
and when done restores back the accessibility state. The issue
was that the accessibility state is not restored leaving the
device in a bad state.

bug:17662770

Change-Id: I3c4f46fa05c76b874eeffdeb867ef433c3fedf2e
2014-09-25 15:56:31 -07:00
Tsuwei Chen
57b558d82a am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
* commit 'e6e4b2bfa3782f63ed0b4b802e5a9d59a6a48f49':
  Fix an incorrect behavior that failed AT&T privacy test.
2014-09-25 22:47:29 +00:00
Adrian Roos
dc1fc7fc77 am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
* commit '05ade73e580b826ead839d3c5db508a8ea25ad93':
  Ensure that setting an empty password clears it
2014-09-25 22:47:25 +00:00
Eino-Ville Talvala
3517b1db4a am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
* commit '7b6a4acdeb6bddbb6b058c227e037c714dd8f2b8':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.
2014-09-25 22:47:21 +00:00
Tsuwei Chen
43d5d89678 Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev 2014-09-25 22:43:04 +00:00
Adrian Roos
625e8f5959 Merge "Ensure that setting an empty password clears it" into lmp-dev 2014-09-25 22:42:43 +00:00