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

94952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
fe1f3a1bef Merge "Fix ViewRootImpl to find missing focus using D-pad." 2013-02-08 23:29:11 +00:00
Joe Fernandez
46e31ae425 docs: Android SDK 21.1.0 Release Notes 
Change-Id: I1e97eb5a7e3b4a1c63474f7b85cb22dd343ceb4b
 2013-02-08 14:28:02 -08:00
The Android Automerger
763ef60466 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-08 13:51:07 -08:00
Dirk Dougherty
b555029e41 am 2e65e20c: am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:21:03 -08:00
Dirk Dougherty
2e65e20c76 am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '9b8b4ae5d7a4f5fbe242f5a2da145fd0fa88ce87':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:17:50 -08:00
Dirk Dougherty
9b8b4ae5d7 am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'f2d89ef9d57b096962b802608a88d3483a51d08a':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:16:11 -08:00
Dirk Dougherty
f2d89ef9d5 am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '64ab8fdcb0a3015d3e6c4db0a1d66443085fd673':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:14:23 -08:00
Dirk Dougherty
64ab8fdcb0 Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 2013-02-08 19:10:07 +00:00
Marco Nelissen
85a1ee3021 am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 
# By Jan Bjernler
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'b683f3542a123a07823b51643b1973507bfb57e2':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
 2013-02-08 08:44:36 -08:00
Marco Nelissen
b683f3542a am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 
# By Jan Bjernler
# Via Gerrit Code Review
* commit '69abccc3cdacee354dec8867865a0577a4e14e63':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
 2013-02-08 08:41:20 -08:00
Marco Nelissen
69abccc3cd Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 2013-02-08 16:22:09 +00:00
Jan Bjernler
66eb589957 MediaStore.Audio.Media.getContentUriForPath() returns unexpected content 
MediaStore.Audio.getContentUriForPath() returns an uri to
internal storage if anything but /mnt/sdcard/ is sent in.
This fix checks if there is an additional sdcard
(normally called ext_card) or usb mass storage attached to
the device and then returns an uri to the external db.
The extra sdcard name and the usb mass storage name info is read from
the system environment variable SECONDARY_STORAGE so if a customer
chooses to change the name this will work as expected.

Change-Id: Ib78bca929fe382d4770df895149a0132f0e56994
 2013-02-08 16:17:23 +00:00
Jesse Hall
93194ffbf1 am c2edfa2b: am 7c292062: Merge "Process all display events in order" 
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'c2edfa2b9649f67c142b181c54580c015badfca3':
  Process all display events in order
 2013-02-07 20:26:27 -08:00
Jesse Hall
5a5cc3dcb0 am bc18fe85: am fd1c028e: Merge "Handle hotplug events as described instead of rescanning" 
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'bc18fe851c98dbe6be4eb2655efb1ef95902d961':
  Handle hotplug events as described instead of rescanning
 2013-02-07 20:26:23 -08:00
Robert Ly
74e8693d31 am ddc0a7bd: am 11fa4460: am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'ddc0a7bdf94f4ba84dd4b89b693eb148ff32b5d3':
  makefile changes for gcm javadocs
 2013-02-07 18:01:17 -08:00
Robert Ly
ddc0a7bdf9 am 11fa4460: am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '11fa446033a8600b681efeb857507388e8113d72':
  makefile changes for gcm javadocs
 2013-02-07 17:57:57 -08:00
Robert Ly
11fa446033 am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '9da9a7cda27a9b9a3a08e64e81d0ca10ac4c4ec1':
  makefile changes for gcm javadocs
 2013-02-07 17:55:20 -08:00
Robert Ly
9da9a7cda2 am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'e60b6023ae4fdea932d0effc553dddc38117d235':
  makefile changes for gcm javadocs
 2013-02-07 17:53:29 -08:00
Robert Ly
e60b6023ae Merge "makefile changes for gcm javadocs" into jb-mr1-dev 2013-02-08 01:48:56 +00:00
Jesse Hall
c2edfa2b96 am 7c292062: Merge "Process all display events in order" 
# Via Gerrit Code Review
* commit '7c2920625eb72216025aeb8ea8dce544df0eca36':
  Process all display events in order
 2013-02-07 17:41:50 -08:00
Jesse Hall
bc18fe851c am fd1c028e: Merge "Handle hotplug events as described instead of rescanning" 
# Via Gerrit Code Review
* commit 'fd1c028e34fc559ccccebd18979ee85ec7821dea':
  Handle hotplug events as described instead of rescanning
 2013-02-07 17:41:44 -08:00
Dirk Dougherty
34c880415b Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning. 
Change-Id: I3003fa163f7c9e10925d96f8d89005b42baed315
 2013-02-07 17:32:35 -08:00
Jesse Hall
7c2920625e Merge "Process all display events in order" 2013-02-08 01:29:33 +00:00
Jesse Hall
fd1c028e34 Merge "Handle hotplug events as described instead of rescanning" 2013-02-08 01:29:03 +00:00
Katie McCormick
89e7aa3dae am 2306f0ee: am ee27bcda: am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '2306f0ee3396cd8a85d04dfbc08fb8c5ffa6699f':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:26:13 -08:00
Katie McCormick
2306f0ee33 am ee27bcda: am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit 'ee27bcda8644f8c3f2328acc248b8c5c9d152f59':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:23:00 -08:00
Katie McCormick
ee27bcda86 am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'b68702eb0526633e51d9dbfe6fc971c168e1274a':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:21:29 -08:00
Katie McCormick
b68702eb05 am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '0e66f16abd651bdf5833f4aede4899e627d7b333':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:18:48 -08:00
Katie McCormick
0e66f16abd Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 2013-02-08 01:14:47 +00:00
Katie McCormick
87cfad7d74 Doc change: Scroller Javadoc Bug # 7966653 
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
 2013-02-07 16:42:26 -08:00
Katie McCormick
1309c9e2af am 93ebe284: am 80a01a7f: am ef4196d0: am 89fafaea: Doc update: clean up 
# Via Android Git Automerger (3) and Katie McCormick (1)
* commit '93ebe2845c7f2d7afea1b679020446adcd0047ee':
  Doc update: clean up
 2013-02-07 15:57:21 -08:00
Katie McCormick
93ebe2845c am 80a01a7f: am ef4196d0: am 89fafaea: Doc update: clean up 
# Via Android Git Automerger (2) and Katie McCormick (1)
* commit '80a01a7f1d30ea5540eb8827dd221623f46e5a80':
  Doc update: clean up
 2013-02-07 15:54:33 -08:00
Katie McCormick
80a01a7f1d am ef4196d0: am 89fafaea: Doc update: clean up 
# Via Android Git Automerger (1) and Katie McCormick (1)
* commit 'ef4196d0ec0a5e89c51b3cc455f083af2fbf3b98':
  Doc update: clean up
 2013-02-07 15:52:32 -08:00
Katie McCormick
ef4196d0ec am 89fafaea: Doc update: clean up 
# Via Katie McCormick
* commit '89fafaeae73cc265f13775944ccb2841bbc6766c':
  Doc update: clean up
 2013-02-07 15:49:36 -08:00
The Android Automerger
0474ed4e0c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-07 14:23:30 -08:00
Katie McCormick
89fafaeae7 Doc update: clean up 
Change-Id: Idd11b36d54e01671d45764dd6ed327621a3fa682
 2013-02-07 14:23:14 -08:00
Jesse Hall
62af9551c9 Process all display events in order 
Display events in each batch received from IPC were being processed in
reverse order, and stopped after the first vsync event (latest
chronologically) was handled. This makes perfect sense for vsync
events, but is broken for hotplug events.

Now we process them all in order, handling all except vsync as we see
them. For vsync events, only the last is reported.

Bug: 7491120
Change-Id: I448d139d21dc27128d75ca1d661de666fff51bcb
 2013-02-07 22:01:19 +00:00
Jesse Hall
190fd9aeca Handle hotplug events as described instead of rescanning 
Hotplug events say which display they're for and whether the display
was connected or disconnected. Before, this info was ignored, and the
event just triggered a rescan of all displays. If a display was
disconnected and then reconnected quickly, the rescan would treat this
as a no-op or a device property change and wouldn't turn the display
on.

Now the display manager attempts to update its state with the change
the event describes. So a quick disconnect/connect cycle will cause
the display to be turned on since the display manager will have
updated its internal state to reflect the disconnect event, and will
treat the connect event as a new display rather than a device property
change.

Bug: 7491120
Change-Id: Ia83f7c96b7f16f4c1bed2a73e9b56b0bf7ee3984
 2013-02-07 21:59:41 +00:00
Robert Ly
5f9922d7c3 makefile changes for gcm javadocs 
Change-Id: I5653eb710f13f0a097cb1cf447469c4da7342fe2
 2013-02-07 11:08:44 -08:00
Jaikumar Ganesh
d080bb07c8 am b9620a89: am 9434c112: Merge "Services: Adding HSPAP info in Android" 
# By Arun Ravindran
# Via Android Git Automerger (1) and others
* commit 'b9620a89bd734d749cd162cbcda4699474bbf57a':
  Services: Adding HSPAP info in Android
 2013-02-07 10:57:40 -08:00
Jaikumar Ganesh
b9620a89bd am 9434c112: Merge "Services: Adding HSPAP info in Android" 
# By Arun Ravindran
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '9434c112d1fef52ade78d7ef818daf981bf63bef':
  Services: Adding HSPAP info in Android
 2013-02-07 10:46:10 -08:00
Jaikumar Ganesh
9434c112d1 Merge "Services: Adding HSPAP info in Android" 2013-02-07 17:54:41 +00:00
Daniel Sandler
fb2b5e04a0 am 1fd77470: am 1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock" 
# By Jorge Ruesga
# Via Android Git Automerger (1) and others
* commit '1fd774709790b220bb780e95db7275d60a1eae57':
  DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
 2013-02-06 22:03:55 -08:00
Jeffrey Brown
2990ed7a3b am 3c6ee5b5: am d2bec096: Merge "NullPointerException in SQLiteSession" 
# By László Dávid
# Via Android Git Automerger (1) and others
* commit '3c6ee5b509d6360a431290fff4b366848c293899':
  NullPointerException in SQLiteSession
 2013-02-06 22:03:51 -08:00
Daniel Sandler
1fd7747097 am 1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock" 
# By Jorge Ruesga
# Via Gerrit Code Review (1) and Jorge Ruesga (1)
* commit '1a1e9b317ac2d737ad92a35c4d806f0fda1ede70':
  DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
 2013-02-06 22:01:39 -08:00
Jeffrey Brown
3c6ee5b509 am d2bec096: Merge "NullPointerException in SQLiteSession" 
# By László Dávid
# Via Gerrit Code Review (1) and László Dávid (1)
* commit 'd2bec0960d04578182905b34795c6895760944dd':
  NullPointerException in SQLiteSession
 2013-02-06 22:01:34 -08:00
Daniel Sandler
1a1e9b317a Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock" 2013-02-07 05:09:33 +00:00
Jeffrey Brown
75701e8fc9 am 7eb4db35: am b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32" 
# By Ilya Polenov
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '7eb4db35935237a6bd029d5bafda97fa5d4d905c':
  Fix PointerCoords Parcel incorrectly storing values as Int32
 2013-02-06 20:53:25 -08:00
Jeffrey Brown
edc933318c am a0d547b4: am dac4a90d: Merge "fix hover events consume issue" 
# By Masanori Ogino
# Via Android Git Automerger (1) and others
* commit 'a0d547b43b3508c7253da234f529acf60d00fd13':
  fix hover events consume issue
 2013-02-06 20:53:21 -08:00
Jeffrey Brown
3c239d7e8d am 8934c575: am 88ba2f48: Merge "Disable usage of WAL in DatabaseHelper" 
# By Yevgen Pronenko
# Via Android Git Automerger (1) and others
* commit '8934c57564a864e046c5172ba7d56ab68056ab26':
  Disable usage of WAL in DatabaseHelper
 2013-02-06 20:53:17 -08:00