Jin Seok Park
943dfc32b9
Merge "ExifInterface: Remove dependency on Piex for DNG Test File"
2016-06-30 06:39:17 +00:00
Tyler Gunn
8ac54f16a9
Merge \\"Add missing setPulling() method in Connection.\\" into nyc-mr1-dev am: 089e99ee4d
...
am: 2251dda76b
Change-Id: Id924dc5335527b727c7fde31a581f68dac01808c
2016-06-30 06:35:13 +00:00
Tyler Gunn
2251dda76b
Merge \"Add missing setPulling() method in Connection.\" into nyc-mr1-dev
...
am: 089e99ee4d
Change-Id: I91b9b6d6eaf0df8a13245157bfaeeffd0ee84900
2016-06-30 06:28:37 +00:00
Tyler Gunn
089e99ee4d
Merge "Add missing setPulling() method in Connection." into nyc-mr1-dev
2016-06-30 06:20:42 +00:00
Jin Park
a59d058e15
ExifInterface: Remove dependency on Piex for DNG Test File
...
This CL removes dependency from Piex for a DNG Test file currently in
ExifInterfaceTest.java.
Specific functions include identifying and setting the byte order of
the data, parsing and saving Exif tags, and retrieving thumbnail
image data and information.
The marker HANDLE_RAW will determine whether to use Piex or not.
Bug: 29409358
Change-Id: I4cd9916ac0c6f294fc44d8b76f52d456aeee8cdc
2016-06-30 15:08:13 +09:00
Tyler Gunn
c242ceb406
Add missing setPulling() method in Connection.
...
Change-Id: I89c720b2fa3d3e1304766ba3779410b233a04c6a
2016-06-29 22:35:45 -07:00
Makoto Onuki
0ba4ec6b92
Merge \"Merge \\"Address API council feedback (continued)\\" into nyc-mr1-dev am: 01e51e59dd\" into nyc-mr1-dev-plus-aosp
...
am: bd7d03ab6a
Change-Id: I4a2dd860bdf4ebdcc6ab420d162579307734fa6f
2016-06-30 00:14:24 +00:00
Makoto Onuki
88c6a3eaa3
Merge \"Address API council feedback (continued)\" into nyc-mr1-dev
...
am: 01e51e59dd
Change-Id: Ia3a6d4eb224667956eebd6b935628a2ba40dfb18
2016-06-29 23:59:20 +00:00
Tyler Gunn
a15c17d3c6
Merge \\"API cleanups per API review.\\" into nyc-mr1-dev am: 138a3f3ad4
...
am: ba5f1622da
Change-Id: I0199d6e1a365812c8f7ba3e36390e789234da29f
2016-06-29 23:54:03 +00:00
Makoto Onuki
01e51e59dd
Merge "Address API council feedback (continued)" into nyc-mr1-dev
2016-06-29 23:53:51 +00:00
Tyler Gunn
ba5f1622da
Merge \"API cleanups per API review.\" into nyc-mr1-dev
...
am: 138a3f3ad4
Change-Id: Iad4f2bdc3f903a6497f97ccd2fbdc1943ebded94
2016-06-29 23:49:07 +00:00
Tyler Gunn
138a3f3ad4
Merge "API cleanups per API review." into nyc-mr1-dev
2016-06-29 23:42:10 +00:00
Makoto Onuki
d6880797f7
Address API council feedback (continued)
...
Got a second set of comments.
Bug 29757958
Change-Id: Ib3a3ffd28bc3e35eb0218b0819870eb5c6ebadb5
2016-06-29 15:22:56 -07:00
Daniel Nishi
f06f1b8180
Merge \\"Use the Deletion Helper when system storage is low.\\" into nyc-mr1-dev am: 6401217532
...
am: b8a7ddad7e
Change-Id: I3d51bb6934e4a42ec8e9d7f37d460b780a5941fe
2016-06-29 21:54:10 +00:00
Daniel Nishi
b8a7ddad7e
Merge \"Use the Deletion Helper when system storage is low.\" into nyc-mr1-dev
...
am: 6401217532
Change-Id: I9d8645a32185a8749edeeee654ee81bdd00f240f
2016-06-29 21:47:05 +00:00
Daniel Nishi
6401217532
Merge "Use the Deletion Helper when system storage is low." into nyc-mr1-dev
2016-06-29 21:37:07 +00:00
Dianne Hackborn
4aba72c6c8
Merge \\\"Fix issue #29871385 : Need JobScheduler.scheduleAsPackage to be system API\\\" into nyc-dev am: 205bc262ce am: 381f4eb9be
...
am: d229fdb1c7
Change-Id: Idc70c2c5893ac586cc192ea75fe04fdab421e851
2016-06-29 21:34:02 +00:00
Dianne Hackborn
d229fdb1c7
Merge \\"Fix issue #29871385 : Need JobScheduler.scheduleAsPackage to be system API\\" into nyc-dev am: 205bc262ce
...
am: 381f4eb9be
Change-Id: I5cc4b41990cdf389e6e55f6891a87a9030a6d218
2016-06-29 20:51:33 +00:00
Dianne Hackborn
50beee8af9
Merge \"Fix issue #29871385 : Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
...
am: 205bc262ce
Change-Id: I3d7186834028be519b512fbcb2240d2ff692f564
2016-06-29 20:50:52 +00:00
Dianne Hackborn
381f4eb9be
Merge \"Fix issue #29871385 : Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
...
am: 205bc262ce
Change-Id: I910f4db4503ad20ecce46032691001d1f971bdbf
2016-06-29 20:45:36 +00:00
Dianne Hackborn
1150b735c8
Fix issue #29871385 : Need JobScheduler.scheduleAsPackage to be system API
...
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
2016-06-29 11:49:01 -07:00
Tyler Gunn
9c0eb0bd46
API cleanups per API review.
...
1. removing deprecation for setExtras on Connection/Conference as these
have legitimate use-cases going forward.
2. Expanded documentation on Call.Callback class to clarify how it is
expected to be used.
3. Updated Callback#onConnectionEvent callback docs to clarify its usage.
4. Expanded Call#sendCallEvent docs to clarify expected namespacing of
call event keys and extras keys, as well as clarification about backwards
compatibility and expectations of ConnectionServices.
5. Standardized the "invoked" vs "notifies" language in the Conference
docs.
6. Clarified how Connection callbacks from Telecom should be implemented.
7. Added Bundle parameter expectations for pre-defined connection events.
8. Documented capabilities and properties toString methods.
9. Documented expectations for onCallEvent method.
10. Expanded documentation for sendConnectionEvent method to clarify
namespacing, use cases, etc.
Bug: 29759275
Bug: 29759954
Bug: 29759773
Change-Id: Ib8c983af4dbbfee68edb60937b268e2c1a9b5e64
2016-06-29 11:46:40 -07:00
Amith Yamasani
96c0bc2eb9
Merge \\"An API to check if running in a demo user\\" into nyc-mr1-dev am: b71081e4e9
...
am: b61a5f1d64
Change-Id: I3e4e57997ecf942d0607628529f0bf97f4c1d2ce
2016-06-29 15:29:22 +00:00
Amith Yamasani
b61a5f1d64
Merge \"An API to check if running in a demo user\" into nyc-mr1-dev
...
am: b71081e4e9
Change-Id: Ie4e01ae963a86346acbc81d2ca5824ddefef8d20
2016-06-29 15:24:06 +00:00
Amith Yamasani
1c41dc8ec5
An API to check if running in a demo user
...
Add an API to query if the calling app is running
in a demo user sandbox. This allows apps to customize
the starting experience to a potential customer.
Change-Id: I50e40f9a8c66da4b5672c1dc64606d7bedba3f8c
Fixes: 29833923
2016-06-28 17:05:19 -07:00
Hall Liu
674b428456
Merge \\"Add disable add call during video call extra and carrier config key\\" into nyc-mr1-dev am: 2cd8281a23
...
am: 2258e483f1
Change-Id: I7283e51cda559e4ea976bbd20d149697f7e54e46
2016-06-28 08:20:24 +00:00
Hall Liu
2258e483f1
Merge \"Add disable add call during video call extra and carrier config key\" into nyc-mr1-dev
...
am: 2cd8281a23
Change-Id: I98ed6adcc49525db82c09a98e2c632894a4a0bc9
2016-06-28 02:34:00 +00:00
Hall Liu
10208661cd
Add disable add call during video call extra and carrier config key
...
Bug: 29047863
Change-Id: I977041ec72968bdccc69a706e27dd4b5ec336ba7
2016-06-27 17:19:59 -07:00
Roozbeh Pournader
50008f0c64
Merge "Introduce listEllipsize() and deprecate commaEllipsize()"
2016-06-28 00:14:23 +00:00
Tyler Gunn
bd6dfcc205
Merge \\"Add onConferenceSupportedChanged callback, carrier config.\\" into nyc-mr1-dev am: 780648be53
...
am: da457b206e
Change-Id: I8d2c147c2455dcf6dfcedfde43890b4962f7b4cd
2016-06-28 00:06:48 +00:00
Daniel Nishi
690346b145
Use the Deletion Helper when system storage is low.
...
A notification is posted when the system storage gets too low.
Currently, it redirects into the Storage Settings. Instead,
it should redirect into the Deletion Helper to directly let the
user clear out their storage.
Bug: 29437277
Change-Id: I4e35adf300d5e479d4171f1e6f090f2a757400f2
2016-06-27 15:22:35 -07:00
Tyler Gunn
da457b206e
Merge \"Add onConferenceSupportedChanged callback, carrier config.\" into nyc-mr1-dev
...
am: 780648be53
Change-Id: I71c24e971bf8d36fd5448497b85660be43417632
2016-06-27 21:40:04 +00:00
Tyler Gunn
780648be53
Merge "Add onConferenceSupportedChanged callback, carrier config." into nyc-mr1-dev
2016-06-27 21:35:49 +00:00
Yohei Yukawa
a3fd8bfdfe
Merge \"Merge \\"Use a flag to grant a temporary URI permission.\\" into nyc-mr1-dev am: cb56978912\" into nyc-mr1-dev-plus-aosp
...
am: c58ffb3f9c
Change-Id: Iddc693412d20b86c3a916dd09764d14d23c4fcf4
2016-06-27 20:34:58 +00:00
Yohei Yukawa
badcecb2aa
Merge \"Use a flag to grant a temporary URI permission.\" into nyc-mr1-dev
...
am: cb56978912
Change-Id: I20e1481c6f68a5af4f33e699f5bc505b3a4c1457
2016-06-27 20:30:49 +00:00
Yohei Yukawa
cb56978912
Merge "Use a flag to grant a temporary URI permission." into nyc-mr1-dev
2016-06-27 20:18:51 +00:00
Sanket Padawe
2031d69810
Merge \\"Fix documentation of getTelephonyHistogram() api.\\" into nyc-mr1-dev am: afcc40f818
...
am: fe84c788e0
Change-Id: I7d666c23212797b824ea0387112636fb0861a2d5
2016-06-27 19:37:00 +00:00
Sanket Padawe
fe84c788e0
Merge \"Fix documentation of getTelephonyHistogram() api.\" into nyc-mr1-dev
...
am: afcc40f818
Change-Id: I82a3f890479ce0358b28d1ec6a42c9f154e0d3f0
2016-06-27 19:29:39 +00:00
Sanket Padawe
afcc40f818
Merge "Fix documentation of getTelephonyHistogram() api." into nyc-mr1-dev
2016-06-27 19:21:56 +00:00
Sanket Padawe
7f89016579
Fix documentation of getTelephonyHistogram() api.
...
Bug: 29760459
Change-Id: Ib7c4df81026331f88f6a8776c0042abf4f32c620
2016-06-27 11:57:01 -07:00
Tyler Gunn
7d633d3337
Add onConferenceSupportedChanged callback, carrier config.
...
Used to inform listeners when a connection can or cannot be part of a
conference. Used to inform the conference controller so that it can
recalculate the conferencable connections.
Adding carrier config for carrier requirement.
Bug: 29059073
Change-Id: Iab028fd44d87c8dc2bbbe8bba7ba9ccdc223fe51
2016-06-27 10:49:04 -07:00
Sungsoo Lim
d7e7813734
MediaMetadata: Unhide METADATA_KEY_MEDIA_URI
...
Bug: 29025504
Change-Id: I38973366ead5878a121b266ce7daf63689858cd0
2016-06-27 11:49:09 +09:00
Roozbeh Pournader
3bfce33993
Introduce listEllipsize() and deprecate commaEllipsize()
...
The commaEllipsize() method was beyond repair. It couldn't support
several needed internationalization features, and its API depended on
splitting a string and the language having only one plural form.
Bug: 24097278
Change-Id: I85217e4eadac971c58bb001b62ba386fb1297a24
2016-06-24 16:45:21 -07:00
TreeHugger Robot
57a289865b
Merge "Make getTransition a @TestApi for CTS tests."
2016-06-24 21:46:58 +00:00
George Mount
f239f99113
Make getTransition a @TestApi for CTS tests.
...
Bug 29570647
Change-Id: I85b2b215fbad2ca72e67b17a29cc9b122ae5945e
2016-06-24 11:53:42 -07:00
Yi Kong
dc13e467f0
Merge \\\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\\" into stage-aosp-master am: a725dbd6c7 am: 79f65e5d67
...
am: a5f5a0ec51
Change-Id: Ifc906ae9d7e23b86397ab425b04309897803b45a
2016-06-24 17:11:27 +00:00
Yi Kong
a5f5a0ec51
Merge \\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\" into stage-aosp-master am: a725dbd6c7
...
am: 79f65e5d67
Change-Id: I02446be0c5ce1840dcb21b4019b7a02cf0bee3f5
2016-06-24 17:01:06 +00:00
Yi Kong
79f65e5d67
Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage-aosp-master
...
am: a725dbd6c7
Change-Id: I06af085c2dad7d63539f66b8049d14a73e49c7cc
2016-06-24 16:55:38 +00:00
Yi Kong
a725dbd6c7
Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage-aosp-master
2016-06-24 16:47:31 +00:00
Przemyslaw Szczepaniak
f4c09099ea
Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a am: ab3d167f06 am: 3606de0fb4
...
am: 9dcaf12623
Change-Id: Ifa23e2d020195c326fd41889bb9ffc5186db7617
2016-06-24 12:02:23 +00:00