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

160227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
61b8bfa5d3 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
 2014-09-26 05:03:49 +00:00
Adam Lesinski
3481fd9522 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
 2014-09-26 04:55:25 +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
Adam Powell
da3b0d3f3f 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
 2014-09-26 04:31:00 +00:00
Jinsuk Kim
6efebada6b 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
 2014-09-26 04:30:48 +00:00
Dianne Hackborn
0557bc2220 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
 2014-09-26 04:30:43 +00:00
Svetoslav
7092bea83e 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.
 2014-09-26 04:30:37 +00:00
Junda Liu
5d06f055a1 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
 2014-09-26 04:30:26 +00:00
Tsuwei Chen
2e6c5f1acc 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.
 2014-09-26 04:29:47 +00:00
Adrian Roos
d99db031ea 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
 2014-09-26 04:29:42 +00:00
Eino-Ville Talvala
6c4fb05931 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.
 2014-09-26 04:29:38 +00:00
Michael Wright
2e4c96f879 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.
 2014-09-26 04:29:22 +00:00
Junda Liu
5c1d26bac3 am 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev 
* commit '65f5ce82b4d54d1b5156c7196dab9ade34f8f600':
  Revert "Hide CarrierPrivilege APIs in TelMgr."
 2014-09-26 04:28:42 +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
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
8b09598087 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
 2014-09-26 00:40:54 +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
Eino-Ville Talvala
7e349a54f3 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
 2014-09-26 00:25:41 +00:00
Alan Viverette
aeeb822b6e 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
 2014-09-26 00:25:36 +00:00
Alan Viverette
ea489ed83d 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"
 2014-09-26 00:25:31 +00:00
Svetoslav
88108ab997 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.
 2014-09-26 00:25:26 +00:00
Chris Wren
cdde21e542 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.
 2014-09-26 00:25:21 +00:00
Ruben Brunk
33451859d8 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.
 2014-09-26 00:25:16 +00:00
Amith Yamasani
0666c8d844 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
 2014-09-26 00:25:12 +00:00
John Spurlock
53d1185329 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.
 2014-09-26 00:25:07 +00:00
Paul Lawrence
1d1ebd7f98 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
 2014-09-26 00:23:53 +00:00
RoboErik
28c86a16c0 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
 2014-09-26 00:23:48 +00:00
RoboErik
00bbe915de 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
 2014-09-26 00:23:43 +00:00
Ye Wen
c914c95561 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)
 2014-09-26 00:23:09 +00:00
Junda Liu
6c49e6e923 am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '73d72b6067d7b25c6727b054cfcc44997d03fc23':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-26 00:23:03 +00:00
Chris Wren
ae208ba9ce 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.
 2014-09-26 00:22:56 +00:00
Kenny Guy
b09cdd0a07 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
 2014-09-26 00:22:40 +00:00
Jinsuk Kim
57abd5dafb am e802276c: Merge "CEC: Send keys to active routing path" into lmp-mr1-dev 
* commit 'e802276cd12cdec416bf7b59364426b0b328be1c':
  CEC: Send keys to active routing path
 2014-09-26 00:21:51 +00:00
Dianne Hackborn
302cda1848 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
 2014-09-26 00:21:47 +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
Svetoslav
1721f4539a 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.
 2014-09-25 23:59:42 +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
Junda Liu
1ebfe599bd am 4c5747ed: Update api/current.txt to unhide APIs by ag/554960 
* commit '4c5747ede6a4aeac12b3239ff34adf6549581e42':
  Update api/current.txt to unhide APIs by ag/554960
 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
Tsuwei Chen
6982263256 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.
 2014-09-25 23:09:34 +00:00
Adrian Roos
f8b1d1320a 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
 2014-09-25 23:08:59 +00:00
Eino-Ville Talvala
07f8620190 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.
 2014-09-25 23:08:55 +00:00