Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
380,683 Commits 3 Branches 0 Tags
bad8de914ad0edcc3dcafe217cecb9bd98ca7f72
Commit Graph

6874 Commits

Author SHA1 Message Date
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
Paul McLean
455388bdb8 Fix a javadoc @see error 
Bug: 26194337
Change-Id: I7945058e0948238e9b2be7e5d8a7dc3ac4d814dc
 2016-03-21 09:50:18 -06:00
Jae Seo
3ef863db8b Merge "TIF: Annotate constants" into nyc-dev am: 748277f0 
am: c0db390

* commit 'c0db39001cf5603ed202065122a26d593155e859':
  TIF: Annotate constants
 2016-03-19 00:46:43 +00:00
Jae Seo
c0db39001c Merge "TIF: Annotate constants" into nyc-dev 
am: 748277f0

* commit '748277f02637a5ec8566bb65ec5111f168eb5cbd':
  TIF: Annotate constants
 2016-03-19 00:44:12 +00:00
Jae Seo
3b9be6700f TIF: Annotate constants 
Bug: 20980990
Change-Id: I3fac9f19cc705c9d94d2ff24075830f2d65588c8
 2016-03-18 16:15:39 -07:00
Jaesung Chung
d02583fd8b Merge "ExifInterface: do not throw an Exception when XMP" into nyc-dev am: f9e0f20 
am: 27307d0

* commit '27307d0c732b11e32701713c775adfe9b08c1558':
  ExifInterface: do not throw an Exception when XMP
 2016-03-18 07:25:06 +00:00
Jaesung Chung
27307d0c73 Merge "ExifInterface: do not throw an Exception when XMP" into nyc-dev 
am: f9e0f20

* commit 'f9e0f20b28f3cd05d391ff8d49d27782e0f71b41':
  ExifInterface: do not throw an Exception when XMP
 2016-03-18 07:22:45 +00:00
Jaesung Chung
f9e0f20b28 Merge "ExifInterface: do not throw an Exception when XMP" into nyc-dev 2016-03-18 07:17:45 +00:00
Jaesung Chung
d1e20d2c7a ExifInterface: fix writing STRING and SRATIONAL formats 
This CL makes ExifInterface determine the data format of rational
numbers and the values which include several components for exif entry
correctly.

Bug: 27614052
Change-Id: Ic3ea64889fad06ef5f636e4635ab7803a9c9ae29
 2016-03-18 15:17:04 +09:00
Dongwon Kang
c694e22533 Merge "TIF: Remove TvInputManager.Session from system API" into nyc-dev am: 62b5ec7 
am: 1a242b5

* commit '1a242b5024eda73fd00c4e279f2145804a0b0948':
  TIF: Remove TvInputManager.Session from system API
 2016-03-17 22:09:49 +00:00
Dongwon Kang
1a242b5024 Merge "TIF: Remove TvInputManager.Session from system API" into nyc-dev 
am: 62b5ec7

* commit '62b5ec7651ebda7a90682012e00307225201bbd9':
  TIF: Remove TvInputManager.Session from system API
 2016-03-17 22:07:25 +00:00
Dongwon Kang
62b5ec7651 Merge "TIF: Remove TvInputManager.Session from system API" into nyc-dev 2016-03-17 22:01:04 +00:00
Dongwon Kang
841ad718c1 TIF: Remove TvInputManager.Session from system API 
Originally this API is expected to be used some use cases which don't
fit TvView well. e.g. background recording. Removing this from system api
in favor of TvRecodingClient which is introduced in N.

Bug: 25726241
Change-Id: If45fc3e2c5382e7b9e8abf42effebd76fd84b25d
 2016-03-17 13:08:18 -07:00
Julia Reynolds
a1712b7118 Merge "Relax policy access restriction for adjust volume changes." into nyc-dev am: a6b0caf 
am: 9bd14a9

* commit '9bd14a9fcdcf3ba0e146315a46db556f9b096f03':
  Relax policy access restriction for adjust volume changes.
 2016-03-17 19:43:03 +00:00
Hangyu Kuang
d4e94f8968 Merge "stagefright: Document that encoders are free to use available tools associated with the speficifed profile." into nyc-dev am: aa8ba08 
am: 10bbe6a

* commit '10bbe6aeaeb121e03c9d21a37f751d5fc02f0f61':
  stagefright: Document that encoders are free to use available tools associated with the speficifed profile.
 2016-03-17 19:23:59 +00:00
Julia Reynolds
9bd14a9fcd Merge "Relax policy access restriction for adjust volume changes." into nyc-dev 
am: a6b0caf

* commit 'a6b0caf89abcf6934f76e58b39a12e8062b0e8b6':
  Relax policy access restriction for adjust volume changes.
 2016-03-17 19:14:39 +00:00
Glenn Kasten
029464aa06 Merge "Use audio_session_t consistently" into nyc-dev am: 58ae278 
am: 028f3ae

* commit '028f3aec794cf5413f13ad866de8a56a3b1b5343':
  Use audio_session_t consistently
 2016-03-17 19:09:21 +00:00
Julia Reynolds
a6b0caf89a Merge "Relax policy access restriction for adjust volume changes." into nyc-dev 2016-03-17 19:08:15 +00:00
Jean-Michel Trivi
99a2482629 Merge "Dynamic audio policies: device type and address" into nyc-dev am: 4003499 
am: 711a8b1

* commit '711a8b1d3cbc5d03ed32a288ceb90f1ae60cf85f':
  Dynamic audio policies: device type and address
 2016-03-17 18:54:37 +00:00
Hangyu Kuang
10bbe6aeae Merge "stagefright: Document that encoders are free to use available tools associated with the speficifed profile." into nyc-dev 
am: aa8ba08

* commit 'aa8ba08c80481cb21caaaab7c8f3ea98db7855fd':
  stagefright: Document that encoders are free to use available tools associated with the speficifed profile.
 2016-03-17 18:29:47 +00:00
Hangyu Kuang
aa8ba08c80 Merge "stagefright: Document that encoders are free to use available tools associated with the speficifed profile." into nyc-dev 2016-03-17 18:22:11 +00:00
Glenn Kasten
028f3aec79 Merge "Use audio_session_t consistently" into nyc-dev 
am: 58ae278

* commit '58ae278294017abca0dffc95f006ae646c88db89':
  Use audio_session_t consistently
 2016-03-17 18:01:57 +00:00
Jean-Michel Trivi
711a8b1d3c Merge "Dynamic audio policies: device type and address" into nyc-dev 
am: 4003499

* commit '400349907ec5bb09887e5ba9f9cd1fa1f3d06716':
  Dynamic audio policies: device type and address
 2016-03-17 17:35:11 +00:00
Julia Reynolds
cdaa0b99eb Relax policy access restriction for adjust volume changes. 
Otherwise users can't enter DND while using volume buttons in most
apps.

Bug: 27711587
Change-Id: Idb4976680d9bb88206928a7b623f17d07183ea28
 2016-03-17 13:28:31 -04:00
Bartosz Bialek
a06bf2fce1 Merge "Do not scan a file which cannot be read" am: 258baa3 am: 3fc27c3 
am: 6bca637

* commit '6bca637ea2c0b7b5921597e8b854fefd6f359187':
  Do not scan a file which cannot be read
 2016-03-17 15:52:49 +00:00
Bartosz Bialek
6bca637ea2 Merge "Do not scan a file which cannot be read" am: 258baa3 
am: 3fc27c3

* commit '3fc27c3444e962776815f9bfbaedbc60a9f9571e':
  Do not scan a file which cannot be read
 2016-03-17 15:50:36 +00:00
Marco Nelissen
2c37b515ee Merge "Remove the field of MediaDrm from inner class CryptoSession." 2016-03-17 15:43:32 +00:00
Marco Nelissen
258baa35c0 Merge "Do not scan a file which cannot be read" 2016-03-17 15:42:02 +00:00
Glenn Kasten
58ae278294 Merge "Use audio_session_t consistently" into nyc-dev 2016-03-17 14:22:53 +00:00