Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,041 Commits 3 Branches 0 Tags
8440efc1ae7ba9473c94de72219f654de0dae3f3
Commit Graph

4927 Commits

Author SHA1 Message Date
Jaesung Chung
d1b04ba98f Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev am: 6d01f0a 
am: f8c9926

* commit 'f8c992629bc97dd0890482249662e038341fd2b9':
  ExifInterface: inform the developers to close their FD/streams

Change-Id: I98786e6c27a9ce2a8e3433b8a6c1f9d0e57a757a
 2016-04-09 06:26:00 +00:00
Jaesung Chung
f8c992629b Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev 
am: 6d01f0a

* commit '6d01f0af4301341975e66475758e4e5c49f95d40':
  ExifInterface: inform the developers to close their FD/streams

Change-Id: Ia3eeaef1b5f01ee1a0a2936b24c77c890f22dfb9
 2016-04-09 06:12:06 +00:00
Jaesung Chung
6d01f0af43 Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev 2016-04-09 06:04:37 +00:00
Jaesung Chung
c048c5f74a ExifInterface: inform the developers to close their FD/streams 
After use of constructors for FD/Streams, developers should close their
FD/streams.

Bug: 27948392
Change-Id: I6c26213d6804791e6d72d5830566f63e5ed57284
 2016-04-08 22:34:47 +09:00
Daichi Hirono
8dc7f92c00 Merge "Close MTP database when MtpServer\'s thread is terminated." into nyc-dev 
am: 4e5bbc3

* commit '4e5bbc3ea70a959ab4ab79332f0328b36e6442d6':
  Close MTP database when MtpServer's thread is terminated.

Change-Id: Ie19841ea8fa406a7cc17066d5766fae9dfd53452
 2016-04-08 00:22:52 +00:00
Daichi Hirono
4e5bbc3ea7 Merge "Close MTP database when MtpServer's thread is terminated." into nyc-dev 2016-04-08 00:13:02 +00:00
Dongwon Kang
c324bf2514 Merge "TIF: Fix a typo in the documentation" into nyc-dev am: f07ec15 
am: 025a9217

* commit '025a921799044d48b179f45613d7e25241b6432b':
  TIF: Fix a typo in the documentation

Change-Id: Ic0e82ede4820a3e5736cbdc2b330ce58f3e2c812
 2016-04-07 23:05:13 +00:00
Dongwon Kang
025a921799 Merge "TIF: Fix a typo in the documentation" into nyc-dev 
am: f07ec15

* commit 'f07ec150f3174af4a125b99f6cf053fb22903bfc':
  TIF: Fix a typo in the documentation

Change-Id: I4f3686679a885e1ab26d3a13a58386b333b94d96
 2016-04-07 23:01:22 +00:00
Dongwon Kang
f07ec150f3 Merge "TIF: Fix a typo in the documentation" into nyc-dev 2016-04-07 22:56:47 +00:00
Dongwon Kang
308fe5741f TIF: Fix a typo in the documentation 
Change-Id: I0e4963ca6ce3f42682a7d591f913ea801987b31b
 2016-04-07 13:39:35 -07:00
Daichi Hirono
fe259319e6 Close MTP database when MtpServer's thread is terminated. 
Fix: 28030321
Change-Id: I7efe59b651a62ca917ba74312a80b56c0564e060
(cherry picked from commit dd383597c4)
 2016-04-07 05:47:41 +00:00
Robert Shih
dc05dab86f Merge "DrmInitData: prevent public constructor access" into nyc-dev am: 696dc4d 
am: dd9c91d

* commit 'dd9c91d2bafb255f6ec91e257166c6bfbcc4651a':
  DrmInitData: prevent public constructor access

Change-Id: I9753ed732d1c522b5753946c51f38178b650bd0a
 2016-04-06 17:23:27 +00:00
Robert Shih
dd9c91d2ba Merge "DrmInitData: prevent public constructor access" into nyc-dev 
am: 696dc4d

* commit '696dc4d8df457d9321038f4b7c6f2c8f44f1ee0f':
  DrmInitData: prevent public constructor access

Change-Id: I518a109df2c4f071c5804163bf518208e6425e8b
 2016-04-06 17:17:47 +00:00
Robert Shih
696dc4d8df Merge "DrmInitData: prevent public constructor access" into nyc-dev 2016-04-06 17:13:23 +00:00
Daichi Hirono
d9babdad23 Merge "Close MTP database when MtpServer's thread is terminated." 2016-04-06 04:46:27 +00:00
Daichi Hirono
dd383597c4 Close MTP database when MtpServer's thread is terminated. 
Fix: 28030321
Change-Id: I7efe59b651a62ca917ba74312a80b56c0564e060
 2016-04-06 13:04:51 +09:00
Phil Burk
8680d6d023 Merge "MidiDevice: fix connectPorts for same Process" into nyc-dev am: b2e4e98 
am: 91d9f03

* commit '91d9f03e360a5d5f41ec9cb5baf1dfa855540778':
  MidiDevice: fix connectPorts for same Process

Change-Id: I29fedf16cbeff60313c708fc0646db71cc8246ca
 2016-04-06 04:00:27 +00:00
Phil Burk
91d9f03e36 Merge "MidiDevice: fix connectPorts for same Process" into nyc-dev 
am: b2e4e98

* commit 'b2e4e98e7c2b54966b48945a0418187564d71085':
  MidiDevice: fix connectPorts for same Process

Change-Id: If2cd5fc8b7c4cd102be503ec6c99a76eee4801ba
 2016-04-06 03:57:02 +00:00
Phil Burk
b2e4e98e7c Merge "MidiDevice: fix connectPorts for same Process" into nyc-dev 2016-04-06 03:51:46 +00:00
Phil Burk
80299748cc MidiDevice: fix connectPorts for same Process 
If connectPorts() was called for a device in the same process then
the connection would die when the ParcelFileDescriptor was closed.

Bug: 26406775
Change-Id: Id0538452593b4761ac2a93d366ade76d2e35ce73
Signed-off-by: Phil Burk <philburk@google.com>
 2016-04-05 15:27:53 -07:00
Robert Shih
50cd766a57 DrmInitData: prevent public constructor access 
Bug: 27949882
Change-Id: I8482f8eba18632eea95e14f0123c11da18e70fae
 2016-04-05 14:51:44 -07:00
Eric Laurent
8d3692c565 Merge "MediaActionSound: fix SoundPool load race condition" into nyc-dev am: 2523d8f 
am: 3503886

* commit '3503886bc08c8ead88c30a3f4111f21e57238379':
  MediaActionSound: fix SoundPool load race condition

Change-Id: I51a77e9a9d5b37d0c86595fac1061452cb19c2c5
 2016-04-04 21:51:17 +00:00
Eric Laurent
3503886bc0 Merge "MediaActionSound: fix SoundPool load race condition" into nyc-dev 
am: 2523d8f

* commit '2523d8f1e385bd69bfd33510f1041ee0b7e7db66':
  MediaActionSound: fix SoundPool load race condition

Change-Id: If32589bc3097724872303de6fc9b1723bd68486c
 2016-04-04 21:48:48 +00:00
Eric Laurent
d7a267de78 MediaActionSound: fix SoundPool load race condition 
If play() was called shortly after load() and before the load
completion callback, the sample was considered
loaded although the SoundPool was not ready to play it.

Fixed by implementing a more robust state machine for sound
load and play control.

Bug: 22499793
Change-Id: I727e07f842a0adc5225dc248f16bc4a7225a1c8e
 2016-04-04 12:53:01 -07:00
Robert Shih
83e3f3afb7 Merge "Fix MediaExtractor.getDrmInitData implementation for webm" into nyc-dev am: 5bf198c 
am: 1305623

* commit '1305623441eb197a54df9276c118839c5608b08b':
  Fix MediaExtractor.getDrmInitData implementation for webm

Change-Id: I88d8daa6475b6ac884b78c661e1025a9faa6c7c1
 2016-04-04 17:21:51 +00:00
Robert Shih
1305623441 Merge "Fix MediaExtractor.getDrmInitData implementation for webm" into nyc-dev 
am: 5bf198c

* commit '5bf198c3806c611fceb3d6d373883ed8f11a37fc':
  Fix MediaExtractor.getDrmInitData implementation for webm

Change-Id: I46d4b3a1b17bd11f209a4f9fa150c1d38bb55592
 2016-04-04 17:18:25 +00:00
Robert Shih
5bf198c380 Merge "Fix MediaExtractor.getDrmInitData implementation for webm" into nyc-dev 2016-04-04 17:09:45 +00:00
Sungsoo Lim
b646eab3f5 Merge "MediaBrowser: Make EXTRA_PAGE zero-based" into nyc-dev am: 16bbf7d 
am: 38fdef8

* commit '38fdef8d4e54bcdc9f268662cd5be3a3725bc91a':
  MediaBrowser: Make EXTRA_PAGE zero-based

Change-Id: I28e22e71437270b2b74a6bae2fc5631ecb33b8b3
 2016-04-04 07:09:34 +00:00
Sungsoo Lim
38fdef8d4e Merge "MediaBrowser: Make EXTRA_PAGE zero-based" into nyc-dev 
am: 16bbf7d

* commit '16bbf7d8eddf4778b415e8871ab04885250dbd94':
  MediaBrowser: Make EXTRA_PAGE zero-based

Change-Id: I75f1786e6a2acb2a06e11f1af7856a7344593104
 2016-04-04 07:06:15 +00:00
Sungsoo Lim
0799bd07d7 MediaBrowser: Make EXTRA_PAGE zero-based 
Bug: 27948393
Change-Id: I97fb6b5f13ffb8e006ed4a7efc06e7f45fb5121a
 2016-04-04 11:14:10 +09:00
Jean-Michel Trivi
4d59d33905 Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev am: e731fab 
am: e2e83f1

* commit 'e2e83f1a7d5434311f1b9597f7b91a15d7cde211':
  AudioTrack.Builder: fix javadoc code sample

Change-Id: I6d77e5bfc8951a47a65e67b7c724eb7bcab8d313
 2016-04-02 01:31:42 +00:00
Jean-Michel Trivi
e2e83f1a7d Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev 
am: e731fab

* commit 'e731fab348e5b6d19c078e200afa50f166bfbf7d':
  AudioTrack.Builder: fix javadoc code sample

Change-Id: If68633496ba82655cdf9591ed7cb08b96c7733ca
 2016-04-02 01:27:07 +00:00
Jean-Michel Trivi
49962261b3 AudioTrack.Builder: fix javadoc code sample 
Fix sample rate in javadoc code sample.

Bug 24499652

Change-Id: I8d92ff34981cb4486e780d74213ed88fd3f74cc6
 2016-04-01 17:23:19 -07:00
Robert Shih
c67abec674 Fix MediaExtractor.getDrmInitData implementation for webm 
Should lookup "crypto-key" in individual track formats instead of file format.

Bug: 26070802
Change-Id: I1a0f59e7bca1d311631e7ad90b9a403ac20d319b
 2016-04-01 16:25:53 -07:00
Jean-Michel Trivi
577c1c1570 Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev am: 7fa2caf 
am: f533f04

* commit 'f533f0480795a81529efc9a64e916837bad09318':
  AudioTrack.Builder: fix javadoc code sample

Change-Id: I6710b6df3484ed8dc61b90f460cd75966171d3e6
 2016-04-01 22:03:54 +00:00
Jean-Michel Trivi
dd15f5ae28 Merge "Audio recording activity notification: change callback name" into nyc-dev am: 9cc2c5c 
am: 67e3d66

* commit '67e3d66609912bf9999962b9ffa5ff52e89c593e':
  Audio recording activity notification: change callback name

Change-Id: I6db37e8c1531014e4b69a3b8042bf4112bc31b51
 2016-04-01 22:03:51 +00:00
Jean-Michel Trivi
f533f04807 Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev 
am: 7fa2caf

* commit '7fa2caf34a941a15062ec4ab77b60aa382e76e2a':
  AudioTrack.Builder: fix javadoc code sample

Change-Id: Ia269d56b2881c13d0b72982ba758c842cdf8ad49
 2016-04-01 21:58:56 +00:00
Jean-Michel Trivi
67e3d66609 Merge "Audio recording activity notification: change callback name" into nyc-dev 
am: 9cc2c5c

* commit '9cc2c5ceaa0718c6619890e58cbea3890ebcd9cf':
  Audio recording activity notification: change callback name

Change-Id: I68cd7f3674f1856aaa117ff1381b6d6983c59960
 2016-04-01 21:58:54 +00:00
Jean-Michel Trivi
7fa2caf34a Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev 2016-04-01 21:53:23 +00:00
Jean-Michel Trivi
e27a75173f AudioTrack.Builder: fix javadoc code sample 
Code sample in javadoc for AudioTrack.Builder didn't compile.

Bug 24499652

Change-Id: Ib881052bdebd74a25bb86ab73f9679b17c3ce62b
 2016-04-01 21:52:42 +00:00
Jean-Michel Trivi
9cc2c5ceaa Merge "Audio recording activity notification: change callback name" into nyc-dev 2016-04-01 21:48:41 +00:00
Dongwon Kang
8cf308f1d2 Merge "TIF: Add setLabel(CharSequence) in TvInputInfo.Builder" into nyc-dev am: 66ebc88 
am: 93343b8

* commit '93343b8f259f2bbd4335066a4a3302ac49b0f39a':
  TIF: Add setLabel(CharSequence) in TvInputInfo.Builder

Change-Id: I6b49fe36df685c4eb5d555a3b45188bae58f5e1d
 2016-04-01 19:55:19 +00:00
Dongwon Kang
93343b8f25 Merge "TIF: Add setLabel(CharSequence) in TvInputInfo.Builder" into nyc-dev 
am: 66ebc88

* commit '66ebc88626a73f8c2a8833fea000b65dbbf971cc':
  TIF: Add setLabel(CharSequence) in TvInputInfo.Builder

Change-Id: Id6784bb9c1db532915250ee586725c3f15e8de05
 2016-04-01 19:50:43 +00:00
Dongwon Kang
66ebc88626 Merge "TIF: Add setLabel(CharSequence) in TvInputInfo.Builder" into nyc-dev 2016-04-01 19:42:41 +00:00
Ronghua Wu
2fd7157ab7 media: update dolby vision CodecProfileLevel am: 32e537c 
am: 8a051c1

* commit '8a051c1a35fafaf5b09a4f2e7d074fe10347d925':
  media: update dolby vision CodecProfileLevel

Change-Id: I7fb4443d4e2de8275f5d2e6115245bb45de5711a
 2016-04-01 18:41:56 +00:00
Ronghua Wu
8a051c1a35 media: update dolby vision CodecProfileLevel 
am: 32e537c

* commit '32e537c610b66ca975e6d9e4cf5dadb4a7cb62d3':
  media: update dolby vision CodecProfileLevel

Change-Id: I57990eabeea272fee71ed2aa2cd631e9e92fb190
 2016-04-01 18:34:32 +00:00
Ronghua Wu
32e537c610 media: update dolby vision CodecProfileLevel 
Bug: 25684127
Change-Id: I3d35e31b34cc0d23c68eded87d5e443c74833685
 2016-04-01 18:02:41 +00:00
Jean-Michel Trivi
e6a505b775 Audio recording activity notification: change callback name 
Rename AudioRecordingCallback.onRecordConfigChanged() to
  onRecordingConfigChanged() after API council review

Bug 27952000

Change-Id: I362a973781e029bca921181934599dcf60e13136
 2016-04-01 09:56:28 -07:00
Dongwon Kang
d09372ad86 TIF: Add setLabel(CharSequence) in TvInputInfo.Builder 
Bug: 25726241
Change-Id: I8b7cf157dffd0df2b04af0386e448b23409be1e5
 2016-04-01 09:51:27 -07:00
Insun Kang
f695304389 Merge "ExifInterface: Code clean up" into nyc-dev am: faecc3f 
am: 848785f

* commit '848785f20ceff13c9edb9a0730b6416fc3e19f82':
  ExifInterface: Code clean up

Change-Id: I201da9079ba1eaa8d17c44f8dfef4d7d0a552851
 2016-04-01 09:03:27 +00:00