99339 Commits

Author SHA1 Message Date
Wink Saville
5924dc4d7a Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip" 2013-01-29 03:10:54 +00:00
Benoit Goby
e032706da0 am 4daf9b1b: Merge "UsbDeviceManager: Don\'t start UsbDebuggingManager when data is encrypted"
# Via Android (Google) Code Review (1) and Benoit Goby (1)
* commit '4daf9b1ba5d898ac874197543dbd949360edcc45':
  UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted
2013-01-28 18:36:53 -08:00
Benoit Goby
4daf9b1ba5 Merge "UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted" 2013-01-29 02:33:44 +00:00
Jeff Brown
8dd68d794c am 5988335a: Merge "Optimize Looper JNI code."
# Via Android (Google) Code Review (1) and Jeff Brown (1)
* commit '5988335aacdbea5b60b597fa2c52583bc655e30f':
  Optimize Looper JNI code.
2013-01-28 18:18:12 -08:00
Jeff Brown
5988335aac Merge "Optimize Looper JNI code." 2013-01-29 02:14:21 +00:00
Selim Gurun
1e8b0746f8 am 393fa834: Fix public comments for SslErrorHandler.
# Via Selim Gurun
* commit '393fa83424822fca7a105a690d09d796f2241626':
  Fix public comments for SslErrorHandler.
2013-01-28 17:12:32 -08:00
Selim Gurun
393fa83424 Fix public comments for SslErrorHandler.
Fix documentation.

Change-Id: I56a485d2ed3b338f9acb6fa8d7e42cba88ad6291
2013-01-28 16:57:37 -08:00
Jeff Sharkey
5598e5635f am 79cb6acf: Merge "Use the resolved Context in ContentResolver."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '79cb6acf761d3940bf3619e7d1bcf987c50359f6':
  Use the resolved Context in ContentResolver.
2013-01-28 16:01:27 -08:00
Jeff Sharkey
79cb6acf76 Merge "Use the resolved Context in ContentResolver." 2013-01-28 23:58:36 +00:00
Jeff Sharkey
e564a325be Use the resolved Context in ContentResolver.
Change-Id: If62b34a9f6d6305657a02d3f807a24eee63aecf6
2013-01-28 15:52:43 -08:00
Wink Saville
cbb2a2a207 Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
2013-01-28 15:27:47 -08:00
Dianne Hackborn
fdb3f094ca Add GET_CONTENT protocol for allowing multiple selection.
Change-Id: I4c14d32112523d7ab603b2a4e374849dd1c3eff6
2013-01-28 15:10:48 -08:00
Michael Wright
0bc9c40749 am a1deeba3: Merge "Add plumbing for Recent Apps keycode"
# Via Android (Google) Code Review (1) and Michael Wright (1)
* commit 'a1deeba3251620706ed19d18e0dc1dc6afb08736':
  Add plumbing for Recent Apps keycode
2013-01-28 14:36:00 -08:00
Michael Wright
a1deeba325 Merge "Add plumbing for Recent Apps keycode" 2013-01-28 22:32:45 +00:00
Jeff Brown
864693461b Optimize Looper JNI code.
Use static native methods.

Release the native looper objects as soon as the Looper quits
instead of waiting until the GC finalizer to take care of it.

Change-Id: I02783e48782a8f972ec2138862f700ade33d8e78
2013-01-28 14:25:53 -08:00
Romain Guy
55dccf3e98 am 29e4aa7a: Merge "Reinitialize hardware renderer after eglTerminate() Bug #8066455"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '29e4aa7abe6b0c62f31fb23b8572cd5b91f08f5c':
  Reinitialize hardware renderer after eglTerminate() Bug #8066455
2013-01-28 14:10:16 -08:00
Romain Guy
29e4aa7abe Merge "Reinitialize hardware renderer after eglTerminate() Bug #8066455" 2013-01-28 22:07:25 +00:00
Romain Guy
3696779bca Reinitialize hardware renderer after eglTerminate()
Bug #8066455

ViewRootImpl was properly detecting that the renderer was not
ready to draw but would simply schedule another frame, thus sending
the systemui into an inifite redraw loop. This change reinitializes
the renderer if needed (if the renderer is requested but not enabled.)

This CL also fixes an issue caused by the default wallpaper. Since it
never calls eglTerminate(), managed contexts are never reclaimed.

Change-Id: Idb8caa672be8ee35f6e6a7e942d9abd8aa100967
2013-01-28 14:04:07 -08:00
Dianne Hackborn
f77c053c7d am 93f770b5: Merge "Fix bug where we could get stuck repeatedly launching an activity."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '93f770b59fa1bd0f2a5c18fcfaffd2a1fc54f585':
  Fix bug where we could get stuck repeatedly launching an activity.
2013-01-28 12:39:08 -08:00
Fabrice Di Meglio
703214e742 am 96bf00fe: Merge "Fix bug #8051633 Recent Apps thumbnails in RTL mode (Arabic / Hebrew / Farsi) should be aligned"
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '96bf00fe92d824b1da4619b875ed779ed283d11d':
  Fix bug #8051633 Recent Apps thumbnails in RTL mode (Arabic / Hebrew / Farsi) should be aligned
2013-01-28 12:39:05 -08:00
Dianne Hackborn
93f770b59f Merge "Fix bug where we could get stuck repeatedly launching an activity." 2013-01-28 20:36:59 +00:00
Fabrice Di Meglio
96bf00fe92 Merge "Fix bug #8051633 Recent Apps thumbnails in RTL mode (Arabic / Hebrew / Farsi) should be aligned" 2013-01-28 20:33:35 +00:00
Wink Saville
81913ad0b0 am 2602030a: Merge "Add protected log methods to StateMachine"
# Via Android (Google) Code Review (1) and Wink Saville (1)
* commit '2602030a007d902ace3fc573b2820cee31eefc95':
  Add protected log methods to StateMachine
2013-01-28 11:59:12 -08:00
Wink Saville
2602030a00 Merge "Add protected log methods to StateMachine" 2013-01-28 19:56:09 +00:00
Amith Yamasani
5687d2ff03 am a0d089f2: am b3eab8ff: am 1f6178fd: am abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (3) and others
* commit 'a0d089f2b2cad1a18345428c0ac8fd5210f942d5':
  Added focusable true on search_button for D-pad.
2013-01-28 11:52:29 -08:00
Adam Powell
6956ee026f am 9122187f: am bb74d8b9: am 783fe429: am e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (3) and others
* commit '9122187fca67c7509ba2a040b602f67928fc9a98':
  show SELECT ALL icon with text in landscape mode
2013-01-28 11:52:26 -08:00
Amith Yamasani
a0d089f2b2 am b3eab8ff: am 1f6178fd: am abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (2) and others
* commit 'b3eab8ff6169ec6f9e5fe7c00a5dc8925e95b1e6':
  Added focusable true on search_button for D-pad.
2013-01-28 11:44:05 -08:00
Adam Powell
9122187fca am bb74d8b9: am 783fe429: am e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (2) and others
* commit 'bb74d8b9f632bdda2f5639a9516a83f58374b936':
  show SELECT ALL icon with text in landscape mode
2013-01-28 11:44:02 -08:00
Amith Yamasani
b3eab8ff61 am 1f6178fd: am abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (1) and others
* commit '1f6178fd0442338c94cef2fcf12e59c9ce1cf556':
  Added focusable true on search_button for D-pad.
2013-01-28 11:41:06 -08:00
Adam Powell
bb74d8b9f6 am 783fe429: am e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '783fe4295372cee8d024388221414c253802c995':
  show SELECT ALL icon with text in landscape mode
2013-01-28 11:41:03 -08:00
Dianne Hackborn
0798149082 Fix bug where we could get stuck repeatedly launching an activity.
A previous change to avoid losing activities if their process
happens to be gone at the point of launch (by counting that
activity as having its state saved) has resulted in a problem
where an activity that crashes during launch will be repeatedly
relaunched.

This is fixed here by explicitly keeping track of our attempts
to launch the activity since it was last able to save its state,
and not keeping it around if it looks like the launch is
repeatedly failing.

Change-Id: Icefd952443b7eb1222f233db95e0157fc3dd72d1
2013-01-28 11:38:26 -08:00
Amith Yamasani
1f6178fd04 am abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit 'abcb9b96f8d1e3780cf63502ca86a00b3f314b39':
  Added focusable true on search_button for D-pad.
2013-01-28 11:37:48 -08:00
Adam Powell
783fe42953 am e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit 'e305e5f68df8338cb3c4bdcf099d23ec9abce564':
  show SELECT ALL icon with text in landscape mode
2013-01-28 11:37:41 -08:00
Wink Saville
58c73c3f76 Add protected log methods to StateMachine
This allow child classes to Override the logging and
have consistent behavior across StateMachines.

Change-Id: I7e23a44d08ca304ade2d7830fd0e307f63f1879e
2013-01-28 10:52:34 -08:00
Amith Yamasani
abcb9b96f8 Merge "Added focusable true on search_button for D-pad." 2013-01-28 18:46:38 +00:00
Adam Powell
e305e5f68d Merge "show SELECT ALL icon with text in landscape mode" 2013-01-28 18:44:10 +00:00
Amith Yamasani
64a980725f am 6d2def71: am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (3) and others
* commit '6d2def71e0a7f6ed81b96444fb1cce7177251b36':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:40:36 -08:00
Amith Yamasani
6d2def71e0 am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (2) and others
* commit 'c28fde57f0c7762913615b16d651d4e7991d6175':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:33:55 -08:00
Amith Yamasani
c28fde57f0 am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (1) and others
* commit '0b515aece642283a25c6a4416f0aecdaf17bdb58':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:31:01 -08:00
Amith Yamasani
0b515aece6 am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '3cfca67b0f1e3f464274fa5d3b2e31e5288d8f38':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:28:38 -08:00
Siva Velusamy
bc0ed2ce8b am a6a5c8f6: Merge "Support invoking view methods from hierarchy viewer"
# Via Android (Google) Code Review (1) and Siva Velusamy (1)
* commit 'a6a5c8f6b66c0750a28d2ad9cba18d0c730c4393':
  Support invoking view methods from hierarchy viewer
2013-01-28 10:12:04 -08:00
Amith Yamasani
3cfca67b0f Merge "Fix possible integer overflow in MtpStorage" 2013-01-28 18:09:59 +00:00
Siva Velusamy
a6a5c8f6b6 Merge "Support invoking view methods from hierarchy viewer" 2013-01-28 18:03:35 +00:00
Baligh Uddin
c83a795412 Merge "Import translations. DO NOT MERGE" into master-chromium 2013-01-28 17:57:49 +00:00
Baligh Uddin
e27ec5e53e am d7368563: (-s ours) Merge "Import translations. DO NOT MERGE"
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit 'd73685635217a88595eeaa010f92cac65bd59543':
  Import translations. DO NOT MERGE
2013-01-28 09:53:25 -08:00
Baligh Uddin
d736856352 Merge "Import translations. DO NOT MERGE" 2013-01-28 17:49:59 +00:00
Victoria Lease
c8d82dd644 am de07d41f: Merge "Annotate Locations coming from mock providers"
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit 'de07d41f6396f9f040fed2b6780932d8e5dbb482':
  Annotate Locations coming from mock providers
2013-01-28 09:11:18 -08:00
Victoria Lease
de07d41f63 Merge "Annotate Locations coming from mock providers" 2013-01-28 17:07:39 +00:00
Irfan Sheriff
28a068e0bd am e6a6d838: am be3d6457: am a56711a0: am 169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (3) and others
* commit 'e6a6d83845d40526cab2d91d0c92b32d4267f5e1':
  Remove config_wifi_p2p_support from config.xml.
2013-01-28 08:21:23 -08:00
Irfan Sheriff
e6a6d83845 am be3d6457: am a56711a0: am 169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (2) and others
* commit 'be3d6457984cbb3c39ab0741fe8cb721a98139c3':
  Remove config_wifi_p2p_support from config.xml.
2013-01-28 08:18:26 -08:00