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

2126 Commits

Author SHA1 Message Date
Elliott Hughes
5d2d22221a am ce566b50: am ee66531f: Merge "Track libcore API update." 
* commit 'ce566b5068bb73b7e379bb40c3eb74922000bbd9':
  Track libcore API update.
 2013-06-28 16:01:51 -07:00
Elliott Hughes
ce566b5068 am ee66531f: Merge "Track libcore API update." 
* commit 'ee66531f2fa2b6aaa5ca064062f5e8d50b64ff44':
  Track libcore API update.
 2013-06-28 15:58:45 -07:00
Elliott Hughes
6859af17ce Track libcore API update. 
Bug: 3484927
Change-Id: I684d724000d09a52c840076fab5985242c77c908
 2013-06-28 15:28:00 -07:00
Elliott Hughes
34ba52a060 am a9510297: am 505974eb: Merge "Track libcore API update." 
* commit 'a9510297a656c574d063b299f044bc9893af7724':
  Track libcore API update.
 2013-06-28 13:09:58 -07:00
Elliott Hughes
a9510297a6 am 505974eb: Merge "Track libcore API update." 
* commit '505974eb736218d40b1d648ea4af548167a381b1':
  Track libcore API update.
 2013-06-28 13:07:21 -07:00
Elliott Hughes
5931afdc0f Track libcore API update. 
Bug: 3484927
Change-Id: I22fc7e003c3483a20988e91d2b8824626ec022b1
 2013-06-28 10:55:14 -07:00
Elliott Hughes
96fefaa23b am b87e6138: am 618ed234: Merge "Track nio API change." 
* commit 'b87e6138d169e5fd23b964056431e2c357323fd2':
  Track nio API change.
 2013-06-14 16:25:00 -07:00
Elliott Hughes
b87e6138d1 am 618ed234: Merge "Track nio API change." 
* commit '618ed2340283263164f578f818cc09148aacb9ed':
  Track nio API change.
 2013-06-14 16:22:12 -07:00
Elliott Hughes
28b7245cc1 Track nio API change. 
Change-Id: I6a6d6c9e5f658b66dca0db226d2d91ee5f8ab2c7
 2013-06-14 15:41:26 -07:00
Marco Nelissen
3826e8bd6e am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 
* commit '374904621a79eb12416da4a26be515ae9a2d243a':
  Unhide MediaExtractor.getPsshInfo()
 2013-06-11 14:10:26 -07:00
Scott Main
be173f6a16 am 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug: 9359960" into jb-mr2-dev 
* commit '8fb120b67d785dc5ab0ebdb8efd7988da1a94365':
  add ViewGroup's layoutMode attribute to public resources bug: 9359960
 2013-06-11 14:10:18 -07:00
Marco Nelissen
374904621a Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 2013-06-11 04:01:47 +00:00
Marco Nelissen
ecba2e4b95 Unhide MediaExtractor.getPsshInfo() 
b/9373882

Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
 2013-06-10 15:06:28 -07:00
Scott Main
dc74caa7e8 add ViewGroup's layoutMode attribute to public resources 
bug: 9359960

Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
 2013-06-10 14:51:37 -07:00
Elliott Hughes
47aa51d029 am 70b74646: Merge "Track libcore changes." 
* commit '70b74646b8114b7ee9e35ce4283ecab8c8528dcc':
  Track libcore changes.
 2013-06-06 13:53:54 -07:00
Elliott Hughes
598a16f71e Track libcore changes. 
Bug: 3484927
Change-Id: I3a3c4a9f0ad6055261f705987bc576cd28bebb46
 2013-06-06 13:40:21 -07:00
Jeff Brown
6474d8407c am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 
* commit '636af7a1cb90bb2f422bc85356d30f5b4e9342e6':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
 2013-05-30 18:00:08 -07:00
Jeff Brown
636af7a1cb Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 2013-05-31 00:54:41 +00:00
Jeff Brown
14507e257a Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity. 
Bug: 9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
 2013-05-30 14:44:18 -07:00
Daniel Sandler
491c607582 am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 
* commit '054255c6d282a4ab2a95e56859242a2512871296':
  Unhide action to launch Daydream settings.
 2013-05-30 12:36:59 -07:00
Daniel Sandler
054255c6d2 Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 2013-05-30 19:33:07 +00:00
Daniel Sandler
f3c1c7ea0a Unhide action to launch Daydream settings. 
Bug: 9088316
Change-Id: I70b87e1f320cef4f53b2610a94be8e552dd3a757
 2013-05-29 22:28:22 -04:00
Lajos Molnar
fabd32c1fb am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 
* commit '673903a2759067b29bed7e309211000d365e0ad3':
  android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
 2013-05-29 15:18:48 -07:00
Lajos Molnar
673903a275 Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 2013-05-29 19:11:03 +00:00
Lajos Molnar
ecca7f60a6 android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG 
SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead,
MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has
the same value.

Remove this now, so that users will not have to translate
MediaCodec flags to MediaMuxer flags, even though MediaMuxer
takes in MediaCodec.BufferInfo objects to specify these flags.

Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9169479
 2013-05-29 12:08:18 -07:00
Matthew Xie
897d98a753 am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 
* commit '6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
 2013-05-28 22:27:44 -07:00
Matthew Xie
90ca807f7b Revert "Revert "Change GATT_FAILURE from 0 to 0x101"" 
This reverts commit d21f674c150aa26c8094d1418108649f53f810e6
bug 9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb
 2013-05-28 15:28:24 -07:00
Matthew Xie
e7e6bf9f02 am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 
* commit '27e453617a2c179580a55d6cbe0619fa95adf693':
  Revert "Change GATT_FAILURE from 0 to 0x101"
 2013-05-26 14:40:14 -07:00
Matthew Xie
27e453617a Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 2013-05-26 21:38:01 +00:00
Matthew Xie
d21f674c15 Revert "Change GATT_FAILURE from 0 to 0x101" 
This reverts commit 8310e6196ffeb6d0dce33fc1a528113b04f304d6

Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
 2013-05-26 21:03:16 +00:00
Matthew Xie
84e1afcccc am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 
* commit '413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
  Change GATT_FAILURE from 0 to 0x101
 2013-05-26 13:21:44 -07:00
Matthew Xie
413f629300 Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 2013-05-26 20:19:06 +00:00
Matthew Xie
8310e6196f Change GATT_FAILURE from 0 to 0x101 
GATT_FAILURE 0 clashes with GATT_SUCCESS. For now, they represent different
kind of faiure. One for Gatt operation, one for Gatt registration. But we
should separate them as good practice.
bug 9109238

Change-Id: I686bb6004bc8831aa3e3bbffe2f7c8e24412e3c3
 2013-05-23 17:39:35 -07:00
Jeff Brown
b7871af2fb am 50ab525a: Merge "Add route description API." into jb-mr2-dev 
* commit '50ab525af62ef5e1f9cf3433a161f2e874da6116':
  Add route description API.
 2013-05-17 12:44:37 -07:00
Jeff Brown
56d4b744b3 Add route description API. 
Bug: 8175766
Change-Id: I65dbc10fc04f9ff8f6abc1bda23fbf5baa227737
 2013-05-16 14:41:30 -07:00
Kenny Root
f35b35df6e am cdc457bb: Merge "Tracking change to add AEAD functionality" 
* commit 'cdc457bbba0afae2f0bc1b1df7ba596da3a48676':
  Tracking change to add AEAD functionality
 2013-05-14 18:29:22 -07:00
Kenny Root
e60bcc63e5 Tracking change to add AEAD functionality 
This tracks libcore change d416195acbc08f2b3bdd5d5532d40438465d99e9

Change-Id: I4621472e19f6630da8498cc46221b939f11fba66
 2013-05-14 17:54:07 -07:00
Elliott Hughes
4d86196ff2 am b37652a2: Merge "Track libcore API changes." 
* commit 'b37652a297fa3795b03823db3edd5d9d30a43259':
  Track libcore API changes.
 2013-05-14 11:45:38 -07:00
Elliott Hughes
a377b42109 Track libcore API changes. 
Change-Id: Ieb4436a5e3162a114b044bd7561bdaa4931afa0f
 2013-05-14 10:55:52 -07:00
Conley Owens
e5cf479deb am d40c41df: Merge "Track libcore changes." 
* commit 'd40c41df0044a155b68f3c6b21ec08bc64f5b6c7':
  Track libcore changes.
 2013-05-13 14:59:11 -07:00
Elliott Hughes
0d5dee2bc3 Track libcore changes. 
Bug: 3484927
Change-Id: Ifbbde9c7cbba1bccd5e1902ad5a2890bff2b2627
 2013-05-13 14:15:39 -07:00
Elliott Hughes
c56944ed95 am ebda92b8: Merge "Track libcore cleanup." 
* commit 'ebda92b84aeac7a5c5a431d6d9cecea2c3c44a97':
  Track libcore cleanup.
 2013-05-11 00:08:30 -07:00
Elliott Hughes
4dbfe64675 Track libcore cleanup. 
Change-Id: If9065fd48017af5490d0467a46eacd4ad14e4d96
 2013-05-10 23:47:08 -07:00
Elliott Hughes
9a76363016 am 37dbac9c: Merge "Expose @SafeVarargs." 
* commit '37dbac9c40d0d7163028461697f2adef1ffe6c47':
  Expose @SafeVarargs.
 2013-05-10 23:04:41 -07:00
Elliott Hughes
40d6715dbb Expose @SafeVarargs. 
Bug: 3484927
Change-Id: I8ac70b6a102ebf87c51c76935bd87a21f6c17506
 2013-05-10 17:20:38 -07:00
Jeff Brown
f8e5484614 am 9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 
* commit '9766caedf0657615f739d4e441ab9f2fa71aa709':
  Add an API to determine if a route is connecting.
 2013-05-10 16:13:44 -07:00
Jeff Brown
9766caedf0 Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 2013-05-10 23:10:33 +00:00
Conley Owens
e6abfd9656 am d702e48c: Merge "Expose AutoCloseable." 
* commit 'd702e48c1394e4e0fc4db8ffc83e4b9ef6e6a40d':
  Expose AutoCloseable.
 2013-05-10 15:26:26 -07:00
Elliott Hughes
10b802889b Expose AutoCloseable. 
Bug: 3484927
Change-Id: I769c19ffbefb29ce11b828589f3533c24d134242
 2013-05-10 14:21:30 -07:00
Marco Nelissen
86e0b491d1 Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev 2013-05-10 14:12:13 +00:00