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

4856 Commits

Author SHA1 Message Date
Tomasz Mikolajewski
3720f795ce Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev am: e1d0cab 
am: f2c62df

* commit 'f2c62df0365c23357bed8178e7651908a730c782':
  Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.

Change-Id: I59b4cb74bacbafc22a7e0305813a039d132f65bd
 2016-03-31 03:58:25 +00:00
Tomasz Mikolajewski
f2c62df036 Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev 
am: e1d0cab

* commit 'e1d0cabb5f4ccc43d7fa1d84a02a87a8683f8537':
  Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.

Change-Id: Ic637439d4d49829f46c64ecced05c838e45fc211
 2016-03-31 03:55:24 +00:00
Tomasz Mikolajewski
e1d0cabb5f Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev 2016-03-31 03:47:41 +00:00
Tomasz Mikolajewski
2b57efb262 Unhide ExifThumbnail.getThumbnailRange() and make it match the comment. 
Bug: 27579803
Change-Id: If9fe16976cfbc0760a6afb3043d35e0ee387945c
 2016-03-31 10:36:26 +09:00
Jean-Michel Trivi
354b1b6bc0 Merge "Fix audio focus logging" into nyc-dev am: 4e9b8d4 
am: a26c8d3

* commit 'a26c8d38a934ddf7a2c85ee3ca008b19c42ac1f3':
  Fix audio focus logging

Change-Id: I65e9b2aaeba5d6036d02ef88acce60ccb8ad825d
 2016-03-31 00:36:30 +00:00
Jean-Michel Trivi
a26c8d38a9 Merge "Fix audio focus logging" into nyc-dev 
am: 4e9b8d4

* commit '4e9b8d4fe46c9b4f19b74fea92ffb4d51354ad5e':
  Fix audio focus logging

Change-Id: I2220177c6bd4c1a0ba0fd7ad3abd9e52a6241a14
 2016-03-31 00:32:43 +00:00
Jean-Michel Trivi
449362e065 Fix audio focus logging 
Fix error in audio focus dispatching log: the message value (here
  MSSG_FOCUS_CHANGE, which is 0) was logged instead of the focus
  value being sent to the audio focus listener.

Bug 25790720

Change-Id: I534ce8d1059c09a52e56c51acd60405ef3c4cda1
 2016-03-30 12:06:22 -07:00
Jaesung Chung
480596c66c Merge "ExifInterface: keep tags in the original tag groups" into nyc-dev am: 41e54ad 
am: 10e6624

* commit '10e6624312e7760d61bb7406908c1f3ae4d8dfc0':
  ExifInterface: keep tags in the original tag groups

Change-Id: Iaa4e34534786909b1cf2e8a8b69ba9e81d394266
 2016-03-30 16:15:21 +00:00
Jaesung Chung
10e6624312 Merge "ExifInterface: keep tags in the original tag groups" into nyc-dev 
am: 41e54ad

* commit '41e54ad3a8e058f35a17eddff9b498dcf872006e':
  ExifInterface: keep tags in the original tag groups

Change-Id: I0d0464b15b0b41157b9dfd6b241612506d6e02d8
 2016-03-30 11:08:39 +00:00
Jaesung Chung
41e54ad3a8 Merge "ExifInterface: keep tags in the original tag groups" into nyc-dev 2016-03-30 10:59:24 +00:00
Jaesung Chung
4118ca8627 ExifInterface: keep tags in the original tag groups 
Previously ExifInterface saved its tags in the all possible IFD tags via
setAttribute() method even it already knew the right IFD group for those
tags. In this CL, it introduces updateAttribute() and removeAttribute()
methods in order to maintain the internal IFD tags and its values
according to its original EXIF saving states in the given JPEG file.

Bug: 27583378
Change-Id: Ie49163c8c9bdd38b575ccd76938879ccddcd547b
 2016-03-30 13:43:34 +09:00
Phil Burk
1b93daa5ef Merge "AudioTrack: document some throws" into nyc-dev am: 9a95421 
am: 202f4c1

* commit '202f4c1d8b9726519dbfa6899907e6455d2766c5':
  AudioTrack: document some throws
 2016-03-28 22:55:44 +00:00
Phil Burk
202f4c1d8b Merge "AudioTrack: document some throws" into nyc-dev 
am: 9a95421

* commit '9a95421c26dc4d20387e04c37ba6ba89e3cef1bd':
  AudioTrack: document some throws
 2016-03-28 22:51:55 +00:00
Phil Burk
9a95421c26 Merge "AudioTrack: document some throws" into nyc-dev 2016-03-28 22:31:25 +00:00
Phil Burk
eeecfa4401 AudioTrack: document some throws 
For setBufferSizeInFrames() and related methods.

Bug: 27384290
Change-Id: Ie5decb39d7945f304f57163c5da540cfd01903c7
Signed-off-by: Phil Burk <philburk@google.com>
 2016-03-28 14:19:17 -07:00
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