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

113164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhijun He
b87857b50b am 487a8fc9: am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev 
* commit '487a8fc9d487a68159c57b4de896ba7be88f1c2b':
  MediaMuxer: Add setLocation API
 2013-09-10 12:48:13 -07:00
Zhijun He
487a8fc9d4 am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev 
* commit '82d11f8e94e38e434cb6bc5e3e8d87250956fa1c':
  MediaMuxer: Add setLocation API
 2013-09-10 12:43:59 -07:00
Zhijun He
82d11f8e94 Merge "MediaMuxer: Add setLocation API" into klp-dev 2013-09-10 19:41:11 +00:00
Igor Murashkin
9ee3680397 am 900e04c1: am 50209368: Merge "camera2: Don\'t NPE in onStatusChanged" into klp-dev 
* commit '900e04c1a2e0529a9a99be12222efccd5f74e306':
  camera2: Don't NPE in onStatusChanged
 2013-09-10 12:34:48 -07:00
Igor Murashkin
900e04c1a2 am 50209368: Merge "camera2: Don\'t NPE in onStatusChanged" into klp-dev 
* commit '50209368626d53b1f8a4a6fdf50d280c7cf65a65':
  camera2: Don't NPE in onStatusChanged
 2013-09-10 12:31:47 -07:00
Igor Murashkin
5020936862 Merge "camera2: Don't NPE in onStatusChanged" into klp-dev 2013-09-10 19:29:27 +00:00
Kenny Root
8b79730e21 am 3ae0ffe9: am 0611f477: am 90e42717: Merge changes I5d2be3c5,I9017256b 
* commit '3ae0ffe9c65fc8aee4ce46a5c7fb30747bd4c2fa':
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
 2013-09-10 11:58:35 -07:00
Kenny Root
3ae0ffe9c6 am 0611f477: am 90e42717: Merge changes I5d2be3c5,I9017256b 
* commit '0611f47721e32e5386884881b055fde6eec5e3c0':
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
 2013-09-10 11:54:32 -07:00
Kenny Root
0611f47721 am 90e42717: Merge changes I5d2be3c5,I9017256b 
* commit '90e42717e590e2f7d2fb7270daae589a97271c63':
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
 2013-09-10 11:52:16 -07:00
Kenny Root
90e42717e5 Merge changes I5d2be3c5,I9017256b 
* changes:
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
 2013-09-10 18:50:02 +00:00
Chet Haase
b4f6d40f62 am 9f7136e9: am 59b7a4ec: Merge "Fix for transition layout suppression" into klp-dev 
* commit '9f7136e9632a2fa4b8f8b5eaae300b5b104d7807':
  Fix for transition layout suppression
 2013-09-10 11:49:40 -07:00
Kenny Root
0b83f9c805 Add argument to binder call to check key types 
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.

(cherry picked from commit b91773bce1126d28a93f73fbef18f3a79245f24e)

Bug: 10600582
Change-Id: I5d2be3c514ff7404a90df76dc263484c5f226e6f
 2013-09-10 18:49:40 +00:00
Adam Powell
ab83c7b9b5 am 218b1163: am 6a221b3f: Fix some bizarre Spinner behavior 
* commit '218b116344688053d3856a8ea8abc3dc241bcee1':
  Fix some bizarre Spinner behavior
 2013-09-10 11:49:37 -07:00
Chet Haase
9f7136e963 am 59b7a4ec: Merge "Fix for transition layout suppression" into klp-dev 
* commit '59b7a4ec9ce6e9af3afc5a3e66c7e2f36bd74ab7':
  Fix for transition layout suppression
 2013-09-10 11:47:15 -07:00
Adam Powell
218b116344 am 6a221b3f: Fix some bizarre Spinner behavior 
* commit '6a221b3f85fbe7cbfbd11b9eeb672baca27faec2':
  Fix some bizarre Spinner behavior
 2013-09-10 11:47:12 -07:00
Chet Haase
59b7a4ec9c Merge "Fix for transition layout suppression" into klp-dev 2013-09-10 18:44:21 +00:00
Adam Powell
6a221b3f85 Fix some bizarre Spinner behavior 
* Make sure the recycler is cleared when the adapter is changed.
  Bug 10689596

* Don't add views to measure the baseline.
  Bug 10690353

Change-Id: I841dc05652eef3319721631f96332f7900d1a631
 2013-09-10 11:38:52 -07:00
Chet Haase
a56205c485 Fix for transition layout suppression 
The ChangeBounds transition causes its target view parents to suppress
layout for the duration of the transition. This is done to avoid artifacts
caused by running layout while layout bounds are being animated between
different scene values.

In order to react correctly to new transition/scene information (such as
running a new transition while another is already running), the transition
system calls pause() on all running transitions to allow layout (among other
things) to work correctly, then resume() after this is finished. This works
in general, but pause/resume do not take account of child transitions that
have already played and ended. ChangeBounds, uses pause/resume to
restore normal layout and re-enable layout suppression. This means that
when resume() is called on a ChangeBounds transition that has already
ended, that transition will leave the parent in a suppressed-layout
state, basically forever. This can cause artifacts like we're seeing in
recent ActionBar changes where the account spinner is never repopulated because
layout is never allowed to run.

The fix is to note when a transition ends and noop future calls to pause/resume.

Issue #10648936 Transitions don't work with new ActionBar functionality

Change-Id: Id9d41c0352b2270d46cfd5ad4dba130767bbf303
 2013-09-10 11:36:10 -07:00
Kenny Root
4a406787c7 Use hostname verifier directly instead of instance 
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I9017256b3b5d137aeb5a6f455868af7bdfec7885
 2013-09-10 11:05:23 -07:00
Vinit Deshapnde
de1ef64063 am f7bea433: am ba85b970: Merge "Set country code on P2p interfaces as well" into klp-dev 
* commit 'f7bea43325e0ffe04f3a7f729cb141f690c58d2a':
  Set country code on P2p interfaces as well
 2013-09-10 10:38:02 -07:00
Vinit Deshapnde
f7bea43325 am ba85b970: Merge "Set country code on P2p interfaces as well" into klp-dev 
* commit 'ba85b970f3ae7fd58c9a631e64bff0d05b787b9b':
  Set country code on P2p interfaces as well
 2013-09-10 10:35:18 -07:00
Vinit Deshapnde
ba85b970f3 Merge "Set country code on P2p interfaces as well" into klp-dev 2013-09-10 17:32:52 +00:00
Yuhao Zheng
b1bf5f6132 am 41c55361: am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev 
* commit '41c55361d1a68d5d41cc2ff5b1b486b0ed0109fc':
  Add a hidden API to toggle airplane mode.
 2013-09-10 10:16:50 -07:00
Yuhao Zheng
41c55361d1 am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev 
* commit 'e91a3f5229405b39a3ba59aa0a3e44527eef063e':
  Add a hidden API to toggle airplane mode.
 2013-09-10 10:13:22 -07:00
Martijn Coenen
468b6e753f am 6343075f: am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev 
* commit '6343075fbf1fef40d421d060b807e8cbc08849cf':
  Remove legacy HCE APIs.
 2013-09-10 10:13:14 -07:00
Yuhao Zheng
e91a3f5229 Merge "Add a hidden API to toggle airplane mode." into klp-dev 2013-09-10 17:12:00 +00:00
Martijn Coenen
6343075fbf am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev 
* commit '9720d5e11c5175503b383bd903c68d2408d2bb80':
  Remove legacy HCE APIs.
 2013-09-10 10:07:38 -07:00
Martijn Coenen
9720d5e11c Merge "Remove legacy HCE APIs." into klp-dev 2013-09-10 17:04:32 +00:00
Yuhao Zheng
5cd1a0e8d7 Add a hidden API to toggle airplane mode. 
Added a hidden API under ConnectivityManager to toggle airplane mode.
This may be a temp solution for b/10653570.
bug:10653570

Change-Id: I0b2b42230073289eb8dc6891317d62b84e26c133
 2013-09-10 09:57:12 -07:00
Glenn Kasten
83fa7d08c5 am 10779b12: am d9f4e0cf: Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev 
* commit '10779b12eec870f428345d192f200dd0a7ad40bc':
  AudioTrack.getTimestamp() return type is now boolean
 2013-09-10 09:42:15 -07:00
Glenn Kasten
10779b12ee am d9f4e0cf: Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev 
* commit 'd9f4e0cf2c2466d9e05f8562e55d342934f7ed0d':
  AudioTrack.getTimestamp() return type is now boolean
 2013-09-10 09:39:18 -07:00
Glenn Kasten
d9f4e0cf2c Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev 2013-09-10 16:36:23 +00:00
John Reck
4669a5d278 am 8eb3ece8: am 1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev 
* commit '8eb3ece8eeaea4dc06c5b3854d8fd9efea4ef5fc':
  Remove FD optimization case for decodeStream
 2013-09-10 09:31:04 -07:00
John Reck
8eb3ece8ee am 1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev 
* commit '1d2daa7809b58c226410c0060d7837de0a29888a':
  Remove FD optimization case for decodeStream
 2013-09-10 09:29:12 -07:00
John Reck
1d2daa7809 Merge "Remove FD optimization case for decodeStream" into klp-dev 2013-09-10 16:25:14 +00:00
Marco Nelissen
bbfdb779d5 am 488e925f: am 8716c081: Merge "Use correct timescale for "date taken" field" into klp-dev 
* commit '488e925ff96e661e3d61e85939f7bda26a319c1d':
  Use correct timescale for "date taken" field
 2013-09-10 09:14:56 -07:00
Marco Nelissen
488e925ff9 am 8716c081: Merge "Use correct timescale for "date taken" field" into klp-dev 
* commit '8716c08151378f7488a0f129fe43a0b3d4dc499d':
  Use correct timescale for "date taken" field
 2013-09-10 09:12:05 -07:00
Marco Nelissen
8716c08151 Merge "Use correct timescale for "date taken" field" into klp-dev 2013-09-10 16:09:16 +00:00
Amith Yamasani
a927fb6169 am 23d6b7b3: am 618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty string" into klp-dev 
* commit '23d6b7b36096eef53f819ee5eee0aba3beecde67':
  Don't leave space for summary text if it's an empty string
 2013-09-10 09:02:43 -07:00
Amith Yamasani
23d6b7b360 am 618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty string" into klp-dev 
* commit '618f8cc5dbb6dff03ad3270d6b948b1ef90c5dd6':
  Don't leave space for summary text if it's an empty string
 2013-09-10 09:01:09 -07:00
Amith Yamasani
618f8cc5db Merge "Don't leave space for summary text if it's an empty string" into klp-dev 2013-09-10 15:59:37 +00:00
Zhijun He
cfd47481d1 MediaMuxer: Add setLocation API 
This API could be used for camera recording when MediaMuxer is used to write
output media file.

Bug: 10594784
Change-Id: Ide2d6e1d87b246100a5def49bfb8646dc984a512
 2013-09-10 07:52:25 -07:00
Stephen Hines
319cc55c02 am 9b448989: am e3d0f022: Merge "Don\'t set Allocation mSize when we have no Type." into klp-dev 
* commit '9b4489897974db2a7a6d9e19b4de2817bbb4755a':
  Don't set Allocation mSize when we have no Type.
 2013-09-09 22:26:58 -07:00
Stephen Hines
9b44898979 am e3d0f022: Merge "Don\'t set Allocation mSize when we have no Type." into klp-dev 
* commit 'e3d0f022826a2a16e64dc9b5353a2a514393881b':
  Don't set Allocation mSize when we have no Type.
 2013-09-09 22:25:22 -07:00
Stephen Hines
e3d0f02282 Merge "Don't set Allocation mSize when we have no Type." into klp-dev 2013-09-10 05:23:15 +00:00
Baligh Uddin
7da4d0c57a am 85454403: (-s ours) am 5f5e8477: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '85454403584f5b9625b75fb6770271ee74910552':
  Import translations. DO NOT MERGE
 2013-09-09 22:09:01 -07:00
Baligh Uddin
8545440358 am 5f5e8477: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5f5e84770badd10c41fd4a2b01a9958a607eacd9':
  Import translations. DO NOT MERGE
 2013-09-09 22:06:26 -07:00
Baligh Uddin
ab2461477b am ad53a540: (-s ours) am a244732d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ad53a540ede9f006a97a8dceda3e0119d2029fb1':
  Import translations. DO NOT MERGE
 2013-09-09 22:05:29 -07:00
Baligh Uddin
ad53a540ed am a244732d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a244732d93c09da1db9fd79b6e7275649a18c60b':
  Import translations. DO NOT MERGE
 2013-09-09 22:02:58 -07:00
Baligh Uddin
2a5a7b0548 Merge "Import translations. DO NOT MERGE" 2013-09-10 05:01:02 +00:00