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

153401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sailesh Nepal
faed92cdd2 am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev 
* commit '5926650d6099469981369cf5235da6d2b135ba0d':
  Adding support for Cdma conference calling.
 2014-09-26 04:40:34 +00:00
Adam Lesinski
d9aa906e21 am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev 
* commit '581dfee1502375bb49fac43af27d8df43e71d51b':
  AAPT: Fix issue with synthesized resource not actually showing up
 2014-09-26 04:40:30 +00:00
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
Sailesh Nepal
e6ae3fde43 Merge "Adding support for Cdma conference calling." into lmp-dev 2014-09-26 00:56:10 +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
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
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
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
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
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
Michael Wright
b17ff6777d am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '57bb094b818d0e215cd987738078e5c181c26fac':
  Specify a device identifier for keyboard layout notification.
 2014-09-25 22:38:38 +00:00
Eino-Ville Talvala
c2c520950a Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 2014-09-25 22:36:59 +00:00
Michael Wright
e27380ac46 am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
  Specify a device identifier for keyboard layout notification.
 2014-09-25 22:27:05 +00:00
Junda Liu
aa047467a1 Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev 2014-09-25 22:24:34 +00:00
Michael Wright
42dad80418 Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 2014-09-25 22:18:20 +00:00
mike dooley
95ea5765dc Adding support for Cdma conference calling. 
Adding methods to merge and swap Cdma conference
calls from hangouts.

Bug: 17658943
Change-Id: I0ce472415e3455503223fc0dab5e1a8ee415cde9
 2014-09-25 15:09:02 -07:00
Tsuwei Chen
566ebfde2b Fix an incorrect behavior that failed AT&T privacy test. 
Bug: 17278951

Change-Id: I8b8bf4ed19af8738e7cef3553c8a06f7e27c7264
 2014-09-25 14:53:54 -07:00
Eino-Ville Talvala
efdd0cc832 am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes 
* commit '9ceeb831c412d80b0961bcf38d81c789aba1718b':
  Camera2 legacy: Improve robustness to camera service crashes
 2014-09-25 21:45:33 +00:00
Eino-Ville Talvala
845ea54c51 am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes 
* commit '93f0b612350e217b8434a0199ba4723c2cfe0e72':
  Camera2 legacy: Improve robustness to camera service crashes
 2014-09-25 21:34:40 +00:00
Eino-Ville Talvala
52571b9032 Camera2 Legacy: Clear JPEG ids when reconfiguring. 
Otherwise, stale IDs for old streams will be left around, causing
JPEGs to be sent to the wrong consumers.

Bug: 17659125
Change-Id: I98e1a1d389147631bc80eaeb10d57f74a6256f32
 2014-09-25 14:06:55 -07:00
Eino-Ville Talvala
eecc904f13 Camera2 legacy: Improve robustness to camera service crashes 
When the camera service dies, the getParameters call is often the first
to fail, and on legacy mode, this frequently happens in a background thread.
Catch the runtime exceptions and convert to device errors, instead of killing
the process.

Bug: 17587496

Change-Id: I6757961e7c0387defd368a13cb7c343950602400
 2014-09-25 14:06:55 -07:00
Alan Viverette
f4a8123480 am a9517205: am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev 
* commit 'a95172054bb02ebd5991e0242e1f7fccbb539ce9':
  Cut ripple background alpha in half
 2014-09-25 20:26:25 +00:00
Alan Viverette
38e85ec432 am c1b3b21e: am 00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev 
* commit 'c1b3b21e92c2c4ded106906abae20a6ac75638ab':
  Fix "Always apply window insets to action modes"
 2014-09-25 20:26:22 +00:00
Svetoslav
fa28252334 am 09b81193: am 85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev 
* commit '09b811936d5e6c16f8be5ce4921c40ec0f298d29':
  Accessibility events may be fired even if no services observe them.
 2014-09-25 20:26:15 +00:00
Alan Viverette
0546ca9258 am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev 
* commit '21662c96fa9d107a60f4ce98f7179264c972b142':
  Cut ripple background alpha in half
 2014-09-25 20:20:02 +00:00
Alan Viverette
33ae07ab81 Merge "Cut ripple background alpha in half" into lmp-dev 2014-09-25 20:14:34 +00:00
Alan Viverette
68518ddbe2 am 00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev 
* commit '00660f66ef0344698551c88c0f26663f70e31b5e':
  Fix "Always apply window insets to action modes"
 2014-09-25 20:14:29 +00:00
Svetoslav
2d5d5d7947 am 85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev 
* commit '85daf4f04ade8a5d85eab70e63cd184dcb760501':
  Accessibility events may be fired even if no services observe them.
 2014-09-25 20:14:25 +00:00
Chris Wren
b3f87eb694 am cf9ee933: am 2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev 
* commit 'cf9ee9338a7f9972288b5104ee432e8c8cabb46e':
  Allow longer translations in the notification actions.
 2014-09-25 20:12:44 +00:00
Alan Viverette
314dc4c553 Merge "Fix "Always apply window insets to action modes"" into lmp-dev 2014-09-25 20:11:28 +00:00
Svetoslav
57ce30ddfe Merge "Accessibility events may be fired even if no services observe them." into lmp-dev 2014-09-25 20:06:20 +00:00
Alan Viverette
8bdb442703 Cut ripple background alpha in half 
Ripple alpha is supposed to be split evenly between the foreground
ripple layer and the background layer, but the background alpha wasn't
getting adjusted properly.

BUG: 17658817
Change-Id: I7af2f2ed38400a40d4a17da020363c7ae5c71a7b
 2014-09-25 13:06:03 -07:00