Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
242,266 Commits 3 Branches 0 Tags
f15550ee4679a6da080b745583b5736d1bca73ec
Commit Graph

4841 Commits

Author SHA1 Message Date
Daichi Hirono
b5ec969219 Update the comment of MtpDevice#getObjectSizeLong am: 1337deb 
am: bd48200

* commit 'bd48200e89a07fdbb85d03f014bc36c203c1d40c':
  Update the comment of MtpDevice#getObjectSizeLong
 2016-03-28 05:49:02 +00:00
Daichi Hirono
bd48200e89 Update the comment of MtpDevice#getObjectSizeLong 
am: 1337deb

* commit '1337deb6eac47b9eeef0999a928caba0cfca7126':
  Update the comment of MtpDevice#getObjectSizeLong
 2016-03-28 05:44:26 +00:00
Daichi Hirono
1337deb6ea Update the comment of MtpDevice#getObjectSizeLong 
BUG=27805369

Change-Id: I63762fedf540e89e9ca811a143cb178881ef1830
 2016-03-28 04:37:14 +00:00
Jae Seo
40880616c5 Merge "TIF: Notify of visibility or label changes of TvInputInfo" into nyc-dev am: d26ee11 
am: ffcb3ac

* commit 'ffcb3acb900d2fcc3dbe7e7cdcfc171ecff54322':
  TIF: Notify of visibility or label changes of TvInputInfo
 2016-03-25 23:40:21 +00:00
Jae Seo
ffcb3acb90 Merge "TIF: Notify of visibility or label changes of TvInputInfo" into nyc-dev 
am: d26ee11

* commit 'd26ee111720aebcad486dd1a37b5338040a4f915':
  TIF: Notify of visibility or label changes of TvInputInfo
 2016-03-25 23:37:46 +00:00
Jae Seo
c3089b08ac TIF: Notify of visibility or label changes of TvInputInfo 
Bug: 27264461
Change-Id: Iaea9c34855eb7516993e5c92c1e0369d47e59587
 2016-03-25 15:17:08 -07:00
Daichi Hirono
f96242ce99 Merge "Add getObjectSizeLong hidden API to MtpDevice class." into nyc-dev am: a2b88f6 
am: 135c9ee

* commit '135c9eec9692d66ecbebebe03672dbf110ad843c':
  Add getObjectSizeLong hidden API to MtpDevice class.
 2016-03-25 13:08:26 +00:00
Daichi Hirono
135c9eec96 Merge "Add getObjectSizeLong hidden API to MtpDevice class." into nyc-dev 
am: a2b88f6

* commit 'a2b88f633980422b672a225c6aa96019547f5676':
  Add getObjectSizeLong hidden API to MtpDevice class.
 2016-03-25 13:04:41 +00:00
Daichi Hirono
a2b88f6339 Merge "Add getObjectSizeLong hidden API to MtpDevice class." into nyc-dev 2016-03-25 12:54:58 +00:00
Daichi Hirono
787821bce4 Add getObjectSizeLong hidden API to MtpDevice class. 
In the MTP spec, the object size is stored in MtpObjectInfo as unsigned
32-bit integer and fetched by the getObjectInfo operation. For the
objects that are more than 4GB, the object size is provided as one of
extra properties, which are fetched by different operation.

The CL adds to getObjectSizeLong hidden method to Java MtpDevice class
so that client code can obtain 4GB+ object size.

BUG=27805369

Change-Id: I8a5b85c8db39734f00e49709c61b271eb48ff33d
 2016-03-25 20:06:13 +09:00
Sungsoo Lim
0c4e049438 Merge "MediaBrowser: Applying API Review" into nyc-dev am: 21c03f0 
am: 0d94716

* commit '0d94716baf3869c8498b5149c7151ce739372f3d':
  MediaBrowser: Applying API Review
 2016-03-25 04:39:58 +00:00
Sungsoo Lim
0d94716baf Merge "MediaBrowser: Applying API Review" into nyc-dev 
am: 21c03f0

* commit '21c03f0c618842d26fde0034c613841ef6dc3a3d':
  MediaBrowser: Applying API Review
 2016-03-25 04:37:17 +00:00
Sungsoo Lim
21c03f0c61 Merge "MediaBrowser: Applying API Review" into nyc-dev 2016-03-25 04:29:56 +00:00
Jiabin
4b03dd5dd3 Merge "TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)" into nyc-dev am: 2dc6cc9 
am: 93cccd6

* commit '93cccd6e61cbf3d51d1d98a28b9771a9940d10ec':
  TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)
 2016-03-25 02:34:01 +00:00
Jiabin
93cccd6e61 Merge "TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)" into nyc-dev 
am: 2dc6cc9

* commit '2dc6cc9aa4ed44e6f337e8600856cd2e1d3e2f70':
  TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)
 2016-03-25 02:31:18 +00:00
Jiabin Huang
2dc6cc9aa4 Merge "TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)" into nyc-dev 2016-03-25 02:26:04 +00:00
Jaesung Chung
a8bfb48fb3 Merge "ExifInterface: fix creating pointer tags which indicate 0 offset" into nyc-dev am: e468a67 
am: 41d3a80

* commit '41d3a80a3b38f41abce348ab2c109de7b4143029':
  ExifInterface: fix creating pointer tags which indicate 0 offset
 2016-03-24 01:50:20 +00:00
Jaesung Chung
41d3a80a3b Merge "ExifInterface: fix creating pointer tags which indicate 0 offset" into nyc-dev 
am: e468a67

* commit 'e468a67d591225da928a49b783e01622cb2390c7':
  ExifInterface: fix creating pointer tags which indicate 0 offset
 2016-03-24 01:48:06 +00:00
Jaesung Chung
e468a67d59 Merge "ExifInterface: fix creating pointer tags which indicate 0 offset" into nyc-dev 2016-03-24 01:43:07 +00:00
Jiabin
d48d029da4 TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle) 
Bug: 27762945
Change-Id: I7f9757f8ca1eb92f892fb2961717125c8b909663
 2016-03-24 09:57:27 +09:00
Jaesung Chung
616a42f982 ExifInterface: fix creating pointer tags which indicate 0 offset 
When saving attributes(that it writes JPEG again.), now ExifInterface
generates some uncessary pointer tags which refer to an empty EXIF IFD
group, that makes a warning message by ExifInterface when reading again,
which warns that the value of the pointer tag pointing to is invalid.

Bug: 27583378
Change-Id: Id0170c5644541565c98fe4978284098e6664c395
 2016-03-23 10:22:48 -07:00
Jaesung Chung
c4a773da33 Merge "ExifInterface: close the resource after reading EXIF data explicitly" into nyc-dev am: 976bbac 
am: 296f19f26d

* commit '296f19f26d25c7c79b7f1a123230e6b1882ac8c9':
  ExifInterface: close the resource after reading EXIF data explicitly
 2016-03-23 02:39:45 +00:00
Jaesung Chung
992310ccaf Merge "ExifInterface: fix regression of re-writing JPEG" into nyc-dev am: 203ed4d5 
am: 746d467

* commit '746d467e9de38f1f9fb01a778f13132148faec58':
  ExifInterface: fix regression of re-writing JPEG
 2016-03-23 02:39:43 +00:00
Jaesung Chung
296f19f26d Merge "ExifInterface: close the resource after reading EXIF data explicitly" into nyc-dev 
am: 976bbac

* commit '976bbaccc47daa700a9ac2fa4fe9b0b759cf343a':
  ExifInterface: close the resource after reading EXIF data explicitly
 2016-03-23 02:36:15 +00:00
Jaesung Chung
746d467e9d Merge "ExifInterface: fix regression of re-writing JPEG" into nyc-dev 
am: 203ed4d5

* commit '203ed4d50070beaaa463b87d367613da6b7d2ee1':
  ExifInterface: fix regression of re-writing JPEG
 2016-03-23 02:36:13 +00:00
Jaesung Chung
976bbaccc4 Merge "ExifInterface: close the resource after reading EXIF data explicitly" into nyc-dev 2016-03-23 02:30:42 +00:00
Jaesung Chung
203ed4d500 Merge "ExifInterface: fix regression of re-writing JPEG" into nyc-dev 2016-03-23 02:30:29 +00:00
Jaesung Chung
c247791db2 ExifInterface: close the resource after reading EXIF data explicitly 
- In case of giving an argument of the image file name or descriptor,
 we created a InputStream at the inside of ExifInterface, close them
 properly.
- Developers should take care of closing input streams when they use
 input streams since they made those input streams.

Bug: 27636804
Change-Id: I9a3a75b1b55dcb2718a60e14814a04cad939d22c
 2016-03-22 19:20:29 -07:00
Jaesung Chung
42ac0d0015 ExifInterface: fix regression of re-writing JPEG 
Bug: 27583378
Change-Id: I052dfedbb1393705eba378de5eaf3636ed0e65ea
 2016-03-22 19:12:42 -07:00
Dongwon Kang
c9194d1433 Merge "MediaResourceMonitor: Change argument type from string to int" into nyc-dev am: 7b0864c 
am: 7f0020e

* commit '7f0020e47e2ca66369047ec2a30690b85821830d':
  MediaResourceMonitor: Change argument type from string to int
 2016-03-22 23:57:52 +00:00
Dongwon Kang
7f0020e47e Merge "MediaResourceMonitor: Change argument type from string to int" into nyc-dev 
am: 7b0864c

* commit '7b0864cc68c3579045bed3bcabe907a81b674bf0':
  MediaResourceMonitor: Change argument type from string to int
 2016-03-22 23:54:17 +00:00
Dongwon Kang
7b0864cc68 Merge "MediaResourceMonitor: Change argument type from string to int" into nyc-dev 2016-03-22 23:50:03 +00:00
Dongwon Kang
6d8587a81c MediaResourceMonitor: Change argument type from string to int 
Bug: 27529962
Change-Id: I29c165ccf6b44b0ca6812f1ccae758d67b225e0d
 2016-03-22 15:21:01 -07:00
Jaesung Chung
11c9570377 Merge "ExifInterface: fix logs" into nyc-dev am: 285bbbb 
am: 074dfab

* commit '074dfab69ca0b5e66f6e90e5acb0ac02351599a8':
  ExifInterface: fix logs
 2016-03-22 05:47:10 +00:00
Jaesung Chung
77ee42ba9b Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev am: f2a1076 
am: 8dec91b

* commit '8dec91bf9d58601e41bcbc0ea5e9a2d9c72d41d0':
  ExifInterface: fix writing STRING and SRATIONAL formats
 2016-03-22 05:47:08 +00:00
Jaesung Chung
074dfab69c Merge "ExifInterface: fix logs" into nyc-dev 
am: 285bbbb

* commit '285bbbbda45f51f53d18144b7e65edb88c888f1c':
  ExifInterface: fix logs
 2016-03-22 05:44:30 +00:00
Jaesung Chung
8dec91bf9d Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev 
am: f2a1076

* commit 'f2a1076cd3d8fa1e5e6b9ced4380860e720675f7':
  ExifInterface: fix writing STRING and SRATIONAL formats
 2016-03-22 05:44:28 +00:00
Jaesung Chung
285bbbbda4 Merge "ExifInterface: fix logs" into nyc-dev 2016-03-22 05:39:27 +00:00
Jaesung Chung
f2a1076cd3 Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev 2016-03-22 05:38:27 +00:00
Jaesung Chung
c2916968aa ExifInterface: fix logs 
- Give more explanations on dealing with files failed to process.
- Log and return immediately when handling lost JPEG files.
- Minor fixes in logging.

Bug: 27583378, Bug: 27587980
Change-Id: Id9a3d137e5f173fa0e6313402e5dc482a5efd57c
 2016-03-21 22:13:46 -07:00
Jeff Sharkey
e67265d52e Merge "Mark even more Bundles as defusable." into nyc-dev am: 8953147 
am: 07267fa

* commit '07267fafe1439c5156cfd46bd7827e876cd4c190':
  Mark even more Bundles as defusable.
 2016-03-21 21:24:36 +00:00
Jeff Sharkey
07267fafe1 Merge "Mark even more Bundles as defusable." into nyc-dev 
am: 8953147

* commit '895314740072c4ccd317f646b5e8a226ae91afbf':
  Mark even more Bundles as defusable.
 2016-03-21 21:19:07 +00:00
Jeff Sharkey
8953147400 Merge "Mark even more Bundles as defusable." into nyc-dev 2016-03-21 21:10:14 +00:00
Phil Burk
9039385cc1 Merge "Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO" into nyc-dev am: 566e721 
am: 9a6de33

* commit '9a6de33b0b3bc10ae4b87e448302ee11c5d5d0a5':
  Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO
 2016-03-21 19:38:23 +00:00
Phil Burk
9a6de33b0b Merge "Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO" into nyc-dev 
am: 566e721

* commit '566e7212ab5ba29de5e1a3446f029c3aca998258':
  Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO
 2016-03-21 19:35:51 +00:00
Phil Burk
566e7212ab Merge "Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO" into nyc-dev 2016-03-21 19:30:23 +00:00
Jeff Sharkey
f0ec2e0050 Mark even more Bundles as defusable. 
Bug: 27766193
Change-Id: Ib027ac7b40c7a575a76f289faabde9655338865e
 2016-03-21 12:37:57 -06:00
Phil Burk
621dbc8740 Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO 
Prevent developers from using a channelMask that will fail.

Bug: 27721209
Change-Id: I87ad67caedaedf6ed2230165cb1687a2a0b74703
Signed-off-by: Phil Burk <philburk@google.com>
 2016-03-21 11:15:02 -07:00
Paul McLean
5953dfbf0d Merge "Fix a javadoc @see error" into nyc-dev am: 24a99f1 
am: 228defd

* commit '228defd6e3bddaba55de02f18efecd871dee5255':
  Fix a javadoc @see error
 2016-03-21 16:43:47 +00:00
Paul McLean
228defd6e3 Merge "Fix a javadoc @see error" into nyc-dev 
am: 24a99f1

* commit '24a99f115711611ca3fc6293b2fa57bc981f78f5':
  Fix a javadoc @see error
 2016-03-21 16:39:05 +00:00