Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,790 Commits 3 Branches 0 Tags
5953dfbf0df8f4b59629f697e1bc0af035332dbd
Commit Graph

4791 Commits

Author SHA1 Message Date
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
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
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
Jean-Michel Trivi
400349907e Merge "Dynamic audio policies: device type and address" into nyc-dev 2016-03-16 21:31:09 +00:00
Jean-Michel Trivi
4ad39885f2 Dynamic audio policies: device type and address 
Store device type and address in audio mixes regardless of the
  mix route type, no "registration" field.
For LOOP_BACK mixes, assign the REMOTE_SUBMIX device type.

Bug 25448664

Change-Id: I8d59b2fd3e05b1dcf1081ad826f985f5e3e74769
 2016-03-16 12:15:43 -07:00
Dongwon Kang
615c7628ca Merge "TIF: Unhide sendAppPrivateCommand/onAppPrivateCommand" into nyc-dev am: 822ac77 
am: bf0db2e

* commit 'bf0db2e9ed17b3846932039568cddfac99c7ff70':
  TIF: Unhide sendAppPrivateCommand/onAppPrivateCommand
 2016-03-16 18:04:24 +00:00
Dongwon Kang
822ac7745a Merge "TIF: Unhide sendAppPrivateCommand/onAppPrivateCommand" into nyc-dev 2016-03-16 17:56:12 +00:00
Dongwon Kang
f714e62c12 TIF: Unhide sendAppPrivateCommand/onAppPrivateCommand 
Bug: 25726685
Change-Id: Iad6417b4da0543043a7fa17287487313a7670209
 2016-03-16 10:48:18 -07:00
Julia Reynolds
2de0733190 Merge "Prevent apps without DND access from toggling DND via AudioService." into nyc-dev am: af56824 
am: 0fb0f9a

* commit '0fb0f9a7a6f0b051b976c01c3dcf21b92bacd059':
  Prevent apps without DND access from toggling DND via AudioService.
 2016-03-16 16:55:12 +00:00
Julia Reynolds
48034f89b7 Prevent apps without DND access from toggling DND via AudioService. 
Bug: 25395278
Change-Id: Id72830607b01a43848d1261292e5835315ef70d0
 2016-03-16 09:33:02 -04:00
Jaesung Chung
a63516507f Merge "ExifInterface: ignore exceptions when getting wrong images" into nyc-dev am: 36a20cdde3 
am: 6f9e502324

* commit '6f9e502324f5178ac8507c8446c6b65016e546cd':
  ExifInterface: ignore exceptions when getting wrong images
 2016-03-15 23:37:29 +00:00
Jaesung Chung
36a20cdde3 Merge "ExifInterface: ignore exceptions when getting wrong images" into nyc-dev 2016-03-15 23:27:13 +00:00
Li Chen
c9e11dd6d5 Merge "Remove the field of MediaDrm from inner class CryptoSession." into nyc-dev am: 5a5d56b9ef 
am: ef38255770

* commit 'ef38255770e0b9850b46a91b475a7720cdbf66d2':
  Remove the field of MediaDrm from inner class CryptoSession.
 2016-03-15 17:11:03 +00:00
Jeff Tinker
5a5d56b9ef Merge "Remove the field of MediaDrm from inner class CryptoSession." into nyc-dev 2016-03-15 16:59:47 +00:00
Dongwon Kang
e92c891e30 Merge "TIF: Add annotations for the system APIs which requires permissions" into nyc-dev am: 49fd7f1d6e 
am: 0473bf1ae7

* commit '0473bf1ae749da356fdaa8f55ee8f9dca0c7a60c':
  TIF: Add annotations for the system APIs which requires permissions
 2016-03-15 14:57:24 +00:00
Dongwon Kang
49fd7f1d6e Merge "TIF: Add annotations for the system APIs which requires permissions" into nyc-dev 2016-03-15 14:50:48 +00:00
Dongwon Kang
89813b8162 TIF: Add annotations for the system APIs which requires permissions 
Bug: 25726241
Change-Id: I2c1c8fb04c7299f9010c7f3ed0aca2e4f1e8b7bd
 2016-03-15 07:49:53 -07:00
Jaesung Chung
5fa031182b ExifInterface: do not throw an Exception when XMP 
In JPEG, an APP1 section can contain EXIF or XMP. The old code throws an
Exception when XMP APP1 segment is showns.

Bug: 27580432
Change-Id: If42197ea0c33ec4446302c969b42afd3d4b4e3c3
 2016-03-15 18:13:52 +09:00
Jaesung Chung
ffc73482b0 Merge "ExifInterface: handle the invalid offsets and count numbers" into nyc-dev am: 1a506af9a2 
am: 20694fa75e

* commit '20694fa75eac8b341a82fbf5fc410b92ca057cb0':
  ExifInterface: handle the invalid offsets and count numbers
 2016-03-15 08:34:00 +00:00
Jaesung Chung
1a506af9a2 Merge "ExifInterface: handle the invalid offsets and count numbers" into nyc-dev 2016-03-15 08:27:38 +00:00
Jaesung Chung
49371caff0 ExifInterface: handle the invalid offsets and count numbers 
Some JPEG images generated by various camera vendors have wrong offsets
and invalid numbers for indicating the size of components. Instead of
throwing exceptions, this CL makes Exifinterface ignore these cases to
read the information without losing contents already parsed.

Bug: 27583378
Change-Id: Ie8ee0bf49283ef519f4f31c5b8ba78ce3f82fe92
 2016-03-15 17:26:42 +09:00
Hangyu Kuang
5cbd0b84ac stagefright: Document that encoders are free to use available tools 
associated with the speficifed profile.

Bug:27597166
Change-Id: I1437d29c49ddad4779c82baf76c81a0286fa93c8
 2016-03-14 22:27:13 +00:00
Paul McLean
0f4fed678f Merge "Native routing phase 4" into nyc-dev am: 3795330981 
am: 9120998fa3

* commit '9120998fa31e7e021dd52da7db5b4709aa7196df':
  Native routing phase 4
 2016-03-14 20:05:40 +00:00
Paul Mclean
3795330981 Merge "Native routing phase 4" into nyc-dev 2016-03-14 19:56:50 +00:00
Paul McLean
14b4e65aff Native routing phase 4 
Allow Acquire before Realize

Bug: 23899814

Change-Id: I58ab80554893a7df31c3892c75d6bd57fea2b336
 2016-03-14 13:50:04 -06:00