OSDN Git Service

android-x86/frameworks-base.git
9 years agoam c89120c5: am ab8e31e2: am 58be3b36: am 5d5ee54e: Merge "Invalid active window...
Svetoslav [Fri, 26 Sep 2014 05:04:07 +0000 (05:04 +0000)]
am c89120c5: am ab8e31e2: am 58be3b36: am 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev

* commit 'c89120c557aa69c141e1af70e355f88d6b17ce2b':
  Invalid active window if temporary disabling accessibility for test tools.

9 years agoam 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716...
Dianne Hackborn [Fri, 26 Sep 2014 05:04:02 +0000 (05:04 +0000)]
am 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '6b9b8a03847a190e1f3c9cf50fc3989a572d7534':
  Work on issue #17656716: Unhandled exception in Window Manager

9 years agoam 28a845c0: am 5bf925d9: am 5a99c276: am a9ac89a3: Merge "Correctly advertise access...
Alan Viverette [Fri, 26 Sep 2014 05:03:58 +0000 (05:03 +0000)]
am 28a845c0: am 5bf925d9: am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev

* commit '28a845c017c2990b339a50afe57f11f22d8b730b':
  Correctly advertise accessibility scrolling actions

9 years agoam 587e65b1: am 848718a0: am 5926650d: am 7461b5a0: Merge "Adding support for Cdma...
Sailesh Nepal [Fri, 26 Sep 2014 05:03:53 +0000 (05:03 +0000)]
am 587e65b1: am 848718a0: am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev

* commit '587e65b1712817a0f5c9086aa7f63e5f7e5a7acc':
  Adding support for Cdma conference calling.

9 years agoam a196e203: am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synth...
Adam Lesinski [Fri, 26 Sep 2014 05:03:49 +0000 (05:03 +0000)]
am a196e203: am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev

* commit 'a196e203076cb810a21a702b41f6a1d82d029318':
  AAPT: Fix issue with synthesized resource not actually showing up

9 years agoam ab8e31e2: am 58be3b36: am 5d5ee54e: Merge "Invalid active window if temporary...
Svetoslav [Fri, 26 Sep 2014 04:55:40 +0000 (04:55 +0000)]
am ab8e31e2: am 58be3b36: am 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev

* commit 'ab8e31e21662775a9df0293bffa7682f5e3e0426':
  Invalid active window if temporary disabling accessibility for test tools.

9 years agoam 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled...
Dianne Hackborn [Fri, 26 Sep 2014 04:55:36 +0000 (04:55 +0000)]
am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '27429ba1842ea1db1dc678a85f138299d37048f8':
  Work on issue #17656716: Unhandled exception in Window Manager

9 years agoam 5bf925d9: am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrol...
Alan Viverette [Fri, 26 Sep 2014 04:55:33 +0000 (04:55 +0000)]
am 5bf925d9: am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev

* commit '5bf925d93afc314b727ca0a06d022e2fed05032b':
  Correctly advertise accessibility scrolling actions

9 years agoam 848718a0: am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference...
Sailesh Nepal [Fri, 26 Sep 2014 04:55:28 +0000 (04:55 +0000)]
am 848718a0: am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev

* commit '848718a04e7e50402c7c2f10718d1a7e19cf9956':
  Adding support for Cdma conference calling.

9 years agoam 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resour...
Adam Lesinski [Fri, 26 Sep 2014 04:55:25 +0000 (04:55 +0000)]
am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev

* commit '98e858b1f4a2562bb6e7d35f19b46cc3969eb366':
  AAPT: Fix issue with synthesized resource not actually showing up

9 years agoam 58be3b36: am 5d5ee54e: Merge "Invalid active window if temporary disabling accessi...
Svetoslav [Fri, 26 Sep 2014 04:41:42 +0000 (04:41 +0000)]
am 58be3b36: am 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev

* commit '58be3b36d515942100f6fe5e232e73ac882c9d71':
  Invalid active window if temporary disabling accessibility for test tools.

9 years agoam 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in...
Dianne Hackborn [Fri, 26 Sep 2014 04:41:38 +0000 (04:41 +0000)]
am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '24ecbc4fbe66b548a35617c03c7ac068b40b83de':
  Work on issue #17656716: Unhandled exception in Window Manager

9 years agoam 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions...
Alan Viverette [Fri, 26 Sep 2014 04:41:34 +0000 (04:41 +0000)]
am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev

* commit '5a99c276b329a7c828e65083da5d5df73e60915e':
  Correctly advertise accessibility scrolling actions

9 years agoam 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into...
Sailesh Nepal [Fri, 26 Sep 2014 04:40:34 +0000 (04:40 +0000)]
am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev

* commit '5926650d6099469981369cf5235da6d2b135ba0d':
  Adding support for Cdma conference calling.

9 years agoam 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actual...
Adam Lesinski [Fri, 26 Sep 2014 04:40:30 +0000 (04:40 +0000)]
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

9 years agoam d2906536: am 5a6ff09d: am 11133a78: am da7f9bab: Merge "Always show the name of...
Adam Powell [Fri, 26 Sep 2014 04:31:00 +0000 (04:31 +0000)]
am d2906536: am 5a6ff09d: am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev

* commit 'd2906536f40e584ff4b4c348a95ce71958aaffb6':
  Always show the name of the last used Home app in ResolverActivity

9 years agoam 679acfd0: am e802276c: Merge "CEC: Send keys to active routing path" into lmp...
Jinsuk Kim [Fri, 26 Sep 2014 04:30:48 +0000 (04:30 +0000)]
am 679acfd0: am e802276c: Merge "CEC: Send keys to active routing path" into lmp-mr1-dev

* commit '679acfd0208c5f20e52830356515e806b065fc4e':
  CEC: Send keys to active routing path

9 years agoam 5a282ae1: am 31940621: am 801fd360: am fcc42e8f: Merge "Fix issue #17661444: Persi...
Dianne Hackborn [Fri, 26 Sep 2014 04:30:43 +0000 (04:30 +0000)]
am 5a282ae1: am 31940621: am 801fd360: am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev

* commit '5a282ae14802be5d41bcd8c12af8e46663beac83':
  Fix issue #17661444: Persistent service not automatically restarted

9 years agoam d1f86475: am f6998583: am 37b75fdd: am 48ccf043: Merge "Accessibility in bad state...
Svetoslav [Fri, 26 Sep 2014 04:30:37 +0000 (04:30 +0000)]
am d1f86475: am f6998583: am 37b75fdd: am 48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev

* commit 'd1f86475c7cef34153320a484700091ea5ea6140':
  Accessibility in bad state after using SDK tool uiautomatorviewer.

9 years agoam b7a4acc3: am 4c5747ed: Update api/current.txt to unhide APIs by ag/554960
Junda Liu [Fri, 26 Sep 2014 04:30:26 +0000 (04:30 +0000)]
am b7a4acc3: am 4c5747ed: Update api/current.txt to unhide APIs by ag/554960

* commit 'b7a4acc31bca24b12a3216be1ebf70c723e41ced':
  Update api/current.txt to unhide APIs by ag/554960

9 years agoam df9e62f0: am f4ada994: am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior...
Tsuwei Chen [Fri, 26 Sep 2014 04:29:47 +0000 (04:29 +0000)]
am df9e62f0: am f4ada994: am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev

* commit 'df9e62f058e6e8f9a5853460d9c916fe5dfae751':
  Fix an incorrect behavior that failed AT&T privacy test.

9 years agoam b8d22d1c: am f68e624f: am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an...
Adrian Roos [Fri, 26 Sep 2014 04:29:42 +0000 (04:29 +0000)]
am b8d22d1c: am f68e624f: am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev

* commit 'b8d22d1c5bd035346832301e126ba83380bf63c0':
  Ensure that setting an empty password clears it

9 years agoam 8127c2e7: am 55e3fd8e: am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear...
Eino-Ville Talvala [Fri, 26 Sep 2014 04:29:38 +0000 (04:29 +0000)]
am 8127c2e7: am 55e3fd8e: am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev

* commit '8127c2e702f84ccdb280a83b3dc2753684112506':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.

9 years agoam 7d766833: am b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifie...
Michael Wright [Fri, 26 Sep 2014 04:29:22 +0000 (04:29 +0000)]
am 7d766833: am b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev

* commit '7d7668330efa99bdab44e8cc4d240ae0e05a0abb':
  Specify a device identifier for keyboard layout notification.

9 years agoam 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr.""...
Junda Liu [Fri, 26 Sep 2014 04:28:42 +0000 (04:28 +0000)]
am 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev

* commit '65f5ce82b4d54d1b5156c7196dab9ade34f8f600':
  Revert "Hide CarrierPrivilege APIs in TelMgr."

9 years agoam 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for...
Svetoslav [Fri, 26 Sep 2014 01:36:21 +0000 (01:36 +0000)]
am 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev

* commit '5d5ee54ee25cadca06afb7ebf738bc88b7d20d9a':
  Invalid active window if temporary disabling accessibility for test tools.

9 years agoam 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager...
Dianne Hackborn [Fri, 26 Sep 2014 01:30:47 +0000 (01:30 +0000)]
am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '0b1eb9d4ae339629fbbf226160896a917cad4d0d':
  Work on issue #17656716: Unhandled exception in Window Manager

9 years agoam a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
Alan Viverette [Fri, 26 Sep 2014 01:30:43 +0000 (01:30 +0000)]
am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev

* commit 'a9ac89a3fa9291553edb72f4557dcff9e77863ae':
  Correctly advertise accessibility scrolling actions

9 years agoMerge "Invalid active window if temporary disabling accessibility for test tools...
Svetoslav [Fri, 26 Sep 2014 01:28:35 +0000 (01:28 +0000)]
Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev

9 years agoMerge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
Dianne Hackborn [Fri, 26 Sep 2014 01:15:01 +0000 (01:15 +0000)]
Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

9 years agoMerge "Correctly advertise accessibility scrolling actions" into lmp-dev
Alan Viverette [Fri, 26 Sep 2014 01:13:12 +0000 (01:13 +0000)]
Merge "Correctly advertise accessibility scrolling actions" into lmp-dev

9 years agoam 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev
Sailesh Nepal [Fri, 26 Sep 2014 01:06:11 +0000 (01:06 +0000)]
am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev

* commit '7461b5a019dca6e02f1ddba0f75a6548e40fb632':
  Adding support for Cdma conference calling.

9 years agoam 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing...
Adam Lesinski [Fri, 26 Sep 2014 01:06:06 +0000 (01:06 +0000)]
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

9 years agoMerge "Adding support for Cdma conference calling." into lmp-dev
Sailesh Nepal [Fri, 26 Sep 2014 00:56:09 +0000 (00:56 +0000)]
Merge "Adding support for Cdma conference calling." into lmp-dev

9 years agoMerge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev
Adam Lesinski [Fri, 26 Sep 2014 00:51:35 +0000 (00:51 +0000)]
Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev

9 years agoWork on issue #17656716: Unhandled exception in Window Manager
Dianne Hackborn [Fri, 26 Sep 2014 00:41:34 +0000 (17:41 -0700)]
Work on issue #17656716: Unhandled exception in Window Manager

Create descriptive errors when sending unreasonably large
parcels through IPC.

Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd

9 years agoam 5a6ff09d: am 11133a78: am da7f9bab: Merge "Always show the name of the last used...
Adam Powell [Fri, 26 Sep 2014 00:40:54 +0000 (00:40 +0000)]
am 5a6ff09d: am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev

* commit '5a6ff09dbcf86f198f7560294220e57631669287':
  Always show the name of the last used Home app in ResolverActivity

9 years agoam 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in...
Adam Powell [Fri, 26 Sep 2014 00:30:50 +0000 (00:30 +0000)]
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

9 years agoam 040b417f: am 4b168708: am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustnes...
Eino-Ville Talvala [Fri, 26 Sep 2014 00:25:41 +0000 (00:25 +0000)]
am 040b417f: am 4b168708: am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes

* commit '040b417fd85a6b99ff53e4805be17ffde5f6a3c6':
  Camera2 legacy: Improve robustness to camera service crashes

9 years agoam b02f1a0a: am e76f1b82: am a9517205: am 21662c96: Merge "Cut ripple background...
Alan Viverette [Fri, 26 Sep 2014 00:25:36 +0000 (00:25 +0000)]
am b02f1a0a: am e76f1b82: am a9517205: am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev

* commit 'b02f1a0abbf8ba92b845a4f1b2fcb4d0e4f431b2':
  Cut ripple background alpha in half

9 years agoam 889422bb: am df6e14c8: am c1b3b21e: am 00660f66: Merge "Fix "Always apply window...
Alan Viverette [Fri, 26 Sep 2014 00:25:31 +0000 (00:25 +0000)]
am 889422bb: am df6e14c8: am c1b3b21e: am 00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev

* commit '889422bba8f5f19c12479de8802cccc178bc0eb0':
  Fix "Always apply window insets to action modes"

9 years agoam d46e5c59: am 5ec87159: am 09b81193: am 85daf4f0: Merge "Accessibility events may...
Svetoslav [Fri, 26 Sep 2014 00:25:26 +0000 (00:25 +0000)]
am d46e5c59: am 5ec87159: am 09b81193: am 85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev

* commit 'd46e5c59586f478ce1982a229751a3304f676005':
  Accessibility events may be fired even if no services observe them.

9 years agoam 7182e206: am 1f270a93: am cf9ee933: am 2eb3b974: Merge "Allow longer translations...
Chris Wren [Fri, 26 Sep 2014 00:25:21 +0000 (00:25 +0000)]
am 7182e206: am 1f270a93: am cf9ee933: am 2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev

* commit '7182e206d44120526f87e7d8d8996e4369626805':
  Allow longer translations in the notification actions.

9 years agoam 5e312018: am be8900a9: am 4754428d: am e76ce25f: Merge "camera2: Fix null check...
Ruben Brunk [Fri, 26 Sep 2014 00:25:16 +0000 (00:25 +0000)]
am 5e312018: am be8900a9: am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev

* commit '5e312018e6188deb665a9a19950bad176345708a':
  camera2: Fix null check in PictureCallback.

9 years agoam d3399218: am 89d8d175: am 158c51f3: am 95548b39: Merge "Fix GPS icon not showing...
Amith Yamasani [Fri, 26 Sep 2014 00:25:12 +0000 (00:25 +0000)]
am d3399218: am 89d8d175: am 158c51f3: am 95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev

* commit 'd3399218fb73f12efe308d9025b5f6ad26f474d5':
  Fix GPS icon not showing for secondary users

9 years agoam 1a0aba91: am b1e369bc: am 37c874d0: am 0dccf597: Merge "Supertoast when user chang...
John Spurlock [Fri, 26 Sep 2014 00:25:07 +0000 (00:25 +0000)]
am 1a0aba91: am b1e369bc: am 37c874d0: am 0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev

* commit '1a0aba91aefc4d95c831455bf4e91243ceb20c2e':
  Supertoast when user changes zen mode.

9 years agoam 98a18468: am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting...
Paul Lawrence [Fri, 26 Sep 2014 00:23:53 +0000 (00:23 +0000)]
am 98a18468: am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev

* commit '98a18468ef2f6ec7f46c21015c0d8df42ea86ff5':
  Fix pause when setting pin/pattern/password

9 years agoam 7df93654: am 54218f6b: am 10a7dfea: am 504752fb: Merge "Ensure MediaBrowser state...
RoboErik [Fri, 26 Sep 2014 00:23:48 +0000 (00:23 +0000)]
am 7df93654: am 54218f6b: am 10a7dfea: am 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev

* commit '7df9365479e7e775bdaf32d9b5ed9a6eabcfa1fe':
  Ensure MediaBrowser state is set to connecting after a reconnect

9 years agoam 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow null queues to be...
RoboErik [Fri, 26 Sep 2014 00:23:43 +0000 (00:23 +0000)]
am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev

* commit '5e8f023dc17788a18bc5640a42baaf2bec609745':
  Allow null queues to be set in MediaSession

9 years agoam f0df354b: am 272f2321: am a0945b40: resolved conflicts for merge of 13ff7c17 to...
Ye Wen [Fri, 26 Sep 2014 00:23:09 +0000 (00:23 +0000)]
am f0df354b: am 272f2321: am a0945b40: resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev

* commit 'f0df354b0aa1880bae34034cc83ec472e5ff404e':
  Hide carrier app intents in Telephony (1/2)

9 years agoam 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege...
Junda Liu [Fri, 26 Sep 2014 00:23:03 +0000 (00:23 +0000)]
am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev

* commit '73d72b6067d7b25c6727b054cfcc44997d03fc23':
  Hide CarrierPrivilege APIs in TelMgr.

9 years agoam 969cb2db: am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilt...
Chris Wren [Fri, 26 Sep 2014 00:22:56 +0000 (00:22 +0000)]
am 969cb2db: am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev

* commit '969cb2db770a44f1265dc57910edc3f58ae0fbbe':
  getCurrentInterruptionFilter should return the filter value, not the hints.

9 years agoam 07f86bcb: am fbe543fd: am e50eceb1: am 19acab1f: Merge "Ignore badly formed Compon...
Kenny Guy [Fri, 26 Sep 2014 00:22:40 +0000 (00:22 +0000)]
am 07f86bcb: am fbe543fd: am e50eceb1: am 19acab1f: Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev

* commit '07f86bcbd5c259fd59c49d7fd9e7dcf26508bdbd':
  Ignore badly formed ComponentNames when loading device_owner.xml

9 years agoam e802276c: Merge "CEC: Send keys to active routing path" into lmp-mr1-dev
Jinsuk Kim [Fri, 26 Sep 2014 00:21:51 +0000 (00:21 +0000)]
am e802276c: Merge "CEC: Send keys to active routing path" into lmp-mr1-dev

* commit 'e802276cd12cdec416bf7b59364426b0b328be1c':
  CEC: Send keys to active routing path

9 years agoam 31940621: am 801fd360: am fcc42e8f: Merge "Fix issue #17661444: Persistent service...
Dianne Hackborn [Fri, 26 Sep 2014 00:21:47 +0000 (00:21 +0000)]
am 31940621: am 801fd360: am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev

* commit '31940621186b8512adf1d068d3b142a73e23553b':
  Fix issue #17661444: Persistent service not automatically restarted

9 years agoam da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivit...
Adam Powell [Fri, 26 Sep 2014 00:16:26 +0000 (00:16 +0000)]
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

9 years agoMerge "CEC: Send keys to active routing path" into lmp-mr1-dev
Jinsuk Kim [Fri, 26 Sep 2014 00:13:53 +0000 (00:13 +0000)]
Merge "CEC: Send keys to active routing path" into lmp-mr1-dev

9 years agoam 801fd360: am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automati...
Dianne Hackborn [Fri, 26 Sep 2014 00:10:00 +0000 (00:10 +0000)]
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

9 years agoMerge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
Adam Powell [Fri, 26 Sep 2014 00:07:30 +0000 (00:07 +0000)]
Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev

9 years agoam fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restart...
Dianne Hackborn [Fri, 26 Sep 2014 00:00:07 +0000 (00:00 +0000)]
am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev

* commit 'fcc42e8f3375a35dfc92af41fe9303359af84626':
  Fix issue #17661444: Persistent service not automatically restarted

9 years agoam f6998583: am 37b75fdd: am 48ccf043: Merge "Accessibility in bad state after using...
Svetoslav [Thu, 25 Sep 2014 23:59:42 +0000 (23:59 +0000)]
am f6998583: am 37b75fdd: am 48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev

* commit 'f6998583a4ac65ea9968130226a5acf73e4b2f7e':
  Accessibility in bad state after using SDK tool uiautomatorviewer.

9 years agoInvalid active window if temporary disabling accessibility for test tools.
Svetoslav [Thu, 25 Sep 2014 23:48:53 +0000 (16:48 -0700)]
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

9 years agoAlways show the name of the last used Home app in ResolverActivity
Adam Powell [Thu, 25 Sep 2014 23:46:36 +0000 (16:46 -0700)]
Always show the name of the last used Home app in ResolverActivity

Bug 17629220

Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c

9 years agoMerge "Fix issue #17661444: Persistent service not automatically restarted" into...
Dianne Hackborn [Thu, 25 Sep 2014 23:53:13 +0000 (23:53 +0000)]
Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev

9 years agoam 37b75fdd: am 48ccf043: Merge "Accessibility in bad state after using SDK tool...
Svetoslav [Thu, 25 Sep 2014 23:48:32 +0000 (23:48 +0000)]
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.

9 years agoFix issue #17661444: Persistent service not automatically restarted
Dianne Hackborn [Thu, 25 Sep 2014 23:39:40 +0000 (16:39 -0700)]
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

9 years agoam 48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer...
Svetoslav [Thu, 25 Sep 2014 23:37:32 +0000 (23:37 +0000)]
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.

9 years agoam 4c5747ed: Update api/current.txt to unhide APIs by ag/554960
Junda Liu [Thu, 25 Sep 2014 23:37:12 +0000 (23:37 +0000)]
am 4c5747ed: Update api/current.txt to unhide APIs by ag/554960

* commit '4c5747ede6a4aeac12b3239ff34adf6549581e42':
  Update api/current.txt to unhide APIs by ag/554960

9 years agoMerge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev
Svetoslav [Thu, 25 Sep 2014 23:27:00 +0000 (23:27 +0000)]
Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev

9 years agoam f4ada994: am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed...
Tsuwei Chen [Thu, 25 Sep 2014 23:09:34 +0000 (23:09 +0000)]
am f4ada994: am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev

* commit 'f4ada994f91bcdfcb421d76faa8ea84540815e7c':
  Fix an incorrect behavior that failed AT&T privacy test.

9 years agoam f68e624f: am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password...
Adrian Roos [Thu, 25 Sep 2014 23:08:59 +0000 (23:08 +0000)]
am f68e624f: am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev

* commit 'f68e624f77fbd5999085705f314f5eefd418581d':
  Ensure that setting an empty password clears it

9 years agoam 55e3fd8e: am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when...
Eino-Ville Talvala [Thu, 25 Sep 2014 23:08:55 +0000 (23:08 +0000)]
am 55e3fd8e: am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev

* commit '55e3fd8ef50f13327547d1b9999f73727d036b8a':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.

9 years agoUpdate api/current.txt to unhide APIs by ag/554960
Junda Liu [Thu, 25 Sep 2014 21:44:51 +0000 (14:44 -0700)]
Update api/current.txt to unhide APIs by ag/554960

Bug: b/17639966
Change-Id: Ic11f362b170cf6fa16ce16a606c47f045bee9900

9 years agoam b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy...
Tsuwei Chen [Thu, 25 Sep 2014 22:56:43 +0000 (22:56 +0000)]
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.

9 years agoam a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it...
Adrian Roos [Thu, 25 Sep 2014 22:56:39 +0000 (22:56 +0000)]
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

9 years agoam eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring...
Eino-Ville Talvala [Thu, 25 Sep 2014 22:56:36 +0000 (22:56 +0000)]
am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev

* commit 'eeb44d4a77d5dd5050a25cc622bd5e6869e69e14':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.

9 years agoAccessibility in bad state after using SDK tool uiautomatorviewer.
Svetoslav [Thu, 25 Sep 2014 22:56:28 +0000 (15:56 -0700)]
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

9 years agoam b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboar...
Michael Wright [Thu, 25 Sep 2014 22:50:12 +0000 (22:50 +0000)]
am b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev

* commit 'b5344ce5ca726258ec41426203421c7f348adc47':
  Specify a device identifier for keyboard layout notification.

9 years agoam e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into...
Tsuwei Chen [Thu, 25 Sep 2014 22:47:29 +0000 (22:47 +0000)]
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.

9 years agoam 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
Adrian Roos [Thu, 25 Sep 2014 22:47:25 +0000 (22:47 +0000)]
am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev

* commit '05ade73e580b826ead839d3c5db508a8ea25ad93':
  Ensure that setting an empty password clears it

9 years agoam 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
Eino-Ville Talvala [Thu, 25 Sep 2014 22:47:21 +0000 (22:47 +0000)]
am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev

* commit '7b6a4acdeb6bddbb6b058c227e037c714dd8f2b8':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.

9 years agoMerge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
Tsuwei Chen [Thu, 25 Sep 2014 22:43:03 +0000 (22:43 +0000)]
Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev

9 years agoMerge "Ensure that setting an empty password clears it" into lmp-dev
Adrian Roos [Thu, 25 Sep 2014 22:42:41 +0000 (22:42 +0000)]
Merge "Ensure that setting an empty password clears it" into lmp-dev

9 years agoam 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout...
Michael Wright [Thu, 25 Sep 2014 22:38:38 +0000 (22:38 +0000)]
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.

9 years agoMerge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
Eino-Ville Talvala [Thu, 25 Sep 2014 22:36:58 +0000 (22:36 +0000)]
Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev

9 years agoam e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev
Junda Liu [Thu, 25 Sep 2014 22:32:21 +0000 (22:32 +0000)]
am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev

* commit 'e069ca2bbf7ba9091c4169de181c850d19734be7':
  Revert "Hide CarrierPrivilege APIs in TelMgr."

9 years agoam 233bbabf: Merge "Specify a device identifier for keyboard layout notification...
Michael Wright [Thu, 25 Sep 2014 22:27:05 +0000 (22:27 +0000)]
am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev

* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
  Specify a device identifier for keyboard layout notification.

9 years agoMerge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev
Junda Liu [Thu, 25 Sep 2014 22:24:33 +0000 (22:24 +0000)]
Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev

9 years agoMerge "Specify a device identifier for keyboard layout notification." into lmp-dev
Michael Wright [Thu, 25 Sep 2014 22:18:19 +0000 (22:18 +0000)]
Merge "Specify a device identifier for keyboard layout notification." into lmp-dev

9 years agoAdding support for Cdma conference calling.
mike dooley [Thu, 25 Sep 2014 21:49:21 +0000 (14:49 -0700)]
Adding support for Cdma conference calling.

Adding methods to merge and swap Cdma conference
calls from hangouts.

Bug: 17658943
Change-Id: I0ce472415e3455503223fc0dab5e1a8ee415cde9

9 years agoam 4b168708: am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera...
Eino-Ville Talvala [Thu, 25 Sep 2014 22:04:00 +0000 (22:04 +0000)]
am 4b168708: am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes

* commit '4b168708a2380bbf48651344cd908fb44f41c05a':
  Camera2 legacy: Improve robustness to camera service crashes

9 years agoam e76f1b82: am a9517205: am 21662c96: Merge "Cut ripple background alpha in half...
Alan Viverette [Thu, 25 Sep 2014 22:03:18 +0000 (22:03 +0000)]
am e76f1b82: am a9517205: am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev

* commit 'e76f1b82e34bdd2152b13994d3524c3a60e73a98':
  Cut ripple background alpha in half

9 years agoam df6e14c8: am c1b3b21e: am 00660f66: Merge "Fix "Always apply window insets to...
Alan Viverette [Thu, 25 Sep 2014 22:03:14 +0000 (22:03 +0000)]
am df6e14c8: am c1b3b21e: am 00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev

* commit 'df6e14c8306f838cca2a5ed484a1437d7650c27f':
  Fix "Always apply window insets to action modes"

9 years agoam 5ec87159: am 09b81193: am 85daf4f0: Merge "Accessibility events may be fired even...
Svetoslav [Thu, 25 Sep 2014 22:03:09 +0000 (22:03 +0000)]
am 5ec87159: am 09b81193: am 85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev

* commit '5ec87159e8a2f33e583af20f1a2c06fcccf00c4a':
  Accessibility events may be fired even if no services observe them.

9 years agoam 1f270a93: am cf9ee933: am 2eb3b974: Merge "Allow longer translations in the notifi...
Chris Wren [Thu, 25 Sep 2014 22:03:02 +0000 (22:03 +0000)]
am 1f270a93: am cf9ee933: am 2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev

* commit '1f270a93d4ade45a0db694a5241518b9b4549400':
  Allow longer translations in the notification actions.

9 years agoam be8900a9: am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallb...
Ruben Brunk [Thu, 25 Sep 2014 22:02:48 +0000 (22:02 +0000)]
am be8900a9: am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev

* commit 'be8900a96b72d26c987feb63432541f721c06c21':
  camera2: Fix null check in PictureCallback.

9 years agoam 89d8d175: am 158c51f3: am 95548b39: Merge "Fix GPS icon not showing for secondary...
Amith Yamasani [Thu, 25 Sep 2014 22:02:44 +0000 (22:02 +0000)]
am 89d8d175: am 158c51f3: am 95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev

* commit '89d8d175e522f4a8ce77fb3996841d5349162243':
  Fix GPS icon not showing for secondary users

9 years agoam b1e369bc: am 37c874d0: am 0dccf597: Merge "Supertoast when user changes zen mode...
John Spurlock [Thu, 25 Sep 2014 22:02:34 +0000 (22:02 +0000)]
am b1e369bc: am 37c874d0: am 0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev

* commit 'b1e369bca1370f6449a53808d4aae71eda9a1ab6':
  Supertoast when user changes zen mode.

9 years agoFix an incorrect behavior that failed AT&T privacy test.
Tsuwei Chen [Thu, 25 Sep 2014 21:33:08 +0000 (14:33 -0700)]
Fix an incorrect behavior that failed AT&T privacy test.

Bug: 17278951

Change-Id: I8b8bf4ed19af8738e7cef3553c8a06f7e27c7264

9 years agoam 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes
Eino-Ville Talvala [Thu, 25 Sep 2014 21:45:33 +0000 (21:45 +0000)]
am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes

* commit '9ceeb831c412d80b0961bcf38d81c789aba1718b':
  Camera2 legacy: Improve robustness to camera service crashes