Hangyu Kuang
6c08cfff6b
Merge "media: Unhide mpeg2ts format for streaming output format support."
2016-10-04 17:10:23 +00:00
Yi Kong
a6222f6cdb
Merge "Track libcore change 7f8ab8179829c1eb74ff785d55f24e09f560662e"
2016-10-03 15:33:08 +00:00
Tobias Thierer
9fb141c333
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f am: abc432fd09 am: 19e46f91fa
...
am: 041bb95132
2016-10-03 14:12:00 +00:00
Tobias Thierer
041bb95132
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f am: abc432fd09
...
am: 19e46f91fa
2016-10-03 14:05:33 +00:00
Tobias Thierer
01614e4e7f
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)"
2016-10-03 13:41:48 +00:00
Hangyu Kuang
5b168a0c54
media: Unhide mpeg2ts format for streaming output format support.
...
Test: Run the camera recorder and output correct mpeg2ts stream.
Bug: 21620607
Change-Id: Ic79758d568e984d55e822d4b6af8716b856dd7da
2016-09-30 13:25:22 -07:00
Przemyslaw Szczepaniak
0053ff7e01
Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO" am: c60c70dcf9 am: 8297d74de5
...
am: 61eb1615a6
2016-09-30 09:01:52 +00:00
Przemyslaw Szczepaniak
c60c70dcf9
Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO"
2016-09-30 08:43:17 +00:00
Neil Fuller
e451105dca
Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature" am: bd32321b4f am: 125a273e8a am: cc1cf38749
...
am: ff2f0dae1b
2016-09-30 00:35:35 +00:00
Neil Fuller
32ed4a14ec
Merge "Unhide constants related to type annotations" am: 8ac0f45384 am: 505b90ad5c am: de1db61758
...
am: 9a33f3408e
2016-09-30 00:33:15 +00:00
Neil Fuller
ff2f0dae1b
Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature" am: bd32321b4f am: 125a273e8a
...
am: cc1cf38749
2016-09-29 23:45:04 +00:00
Neil Fuller
9a33f3408e
Merge "Unhide constants related to type annotations" am: 8ac0f45384 am: 505b90ad5c
...
am: de1db61758
2016-09-29 23:43:45 +00:00
TreeHugger Robot
c2370dfdd6
Merge "Add app op name string for a runtime permission"
2016-09-29 19:11:46 +00:00
Shubham Ajmera
c95b2c85f3
Add new StrictMode thread policy - DETECT_UNBUFFERED_IO
...
This will enable the developers to check if they could replace an unbuffered
I/O operation with a corresponding buffered I/O operation.
The policy can be set as follow:
StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
.detectUnbufferedIO().build());
Test: vogar BlockGuardTest
Bug: 3018772
Change-Id: Ib804a8e9980ae40abfd216f8b87c250fd413bd5c
(cherry picked from commit 9b7184a8fd
2016-09-29 16:36:12 +01:00
Neil Fuller
bd32321b4f
Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature"
2016-09-29 13:08:30 +00:00
Jordan Liu
4a54638a68
Add editable_voicemail_number key to CarrierConfig
...
Add KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]
This value exists to fix http://b/14093735 . If a SIM card has no
voicemail number available, since the default number is empty, we allow
users to edit the voicemail number when this flag is true.
Bug: 29873049
Change-Id: I68a494e2176306e4e9181a8ccb0aa818f3e08154
2016-09-28 15:26:07 -07:00
Neil Fuller
4c1d37b2a0
Unhide constants related to type annotations
...
Type annotations are supported in the compiler, but not the
Android runtime. Unhiding these is therefore still
reasonable.
Bug: 30391692
Test: make droid
Change-Id: I39db1099918fe3bd6321f2d755a988cb73f657c6
2016-09-28 16:57:59 +01:00
Neil Fuller
0543f71b82
Fix AnnotatedElement.getDeclaredAnnotation() generic signature
...
To match upstream OpenJDK 8.
Bug: 31108290
Test: make droid
Change-Id: Icdf54eb65b8d89ee474ec51eab552ceb3fc6d8ec
2016-09-28 16:56:49 +01:00
Neil Fuller
b36fad8a5f
Rerun of update-api with no changes
...
Picks up a small change to Parameter.
Looks like it was caused by a mid-air collision between
commit 3ead539c01b4fcc6136e
2016-09-28 16:51:03 +01:00
John Reck
463d85cd92
Merge "Expose SurfaceTexture(boolean) constructor"
2016-09-28 14:07:09 +00:00
Alex Klyubin
5e86d951a7
Remove android.net.PskKeyManager
...
android.net.PskKeyManager does not work with upcoming TLS 1.3.
The class does not appear to be used by any Android apps and is thus
likely to be completely removed in the future.
Bug: 30978706
Test: make && make cts
Change-Id: Id9bae20362c5909e4621cdb00102bfee09d970ec
2016-09-27 11:24:32 -07:00
Tobias Thierer
f8ecb7d0d0
Merge "API: Update ResourceBundle to OpenJDK8u60" am: 9d16a441a6 am: 29319829fb am: 49d903dac4
...
am: e44534ddc8
2016-09-27 14:31:09 +00:00
Tobias Thierer
e44534ddc8
Merge "API: Update ResourceBundle to OpenJDK8u60" am: 9d16a441a6 am: 29319829fb
...
am: 49d903dac4
2016-09-27 14:22:08 +00:00
Tobias Thierer
49d903dac4
Merge "API: Update ResourceBundle to OpenJDK8u60" am: 9d16a441a6
...
am: 29319829fb
2016-09-27 14:16:28 +00:00
Tobias Thierer
29319829fb
Merge "API: Update ResourceBundle to OpenJDK8u60"
...
am: 9d16a441a6
2016-09-27 14:11:45 +00:00
Tobias Thierer
9d16a441a6
Merge "API: Update ResourceBundle to OpenJDK8u60"
2016-09-27 14:03:45 +00:00
Nate Fischer
2cab2fd3ff
Merge "Deprecate WebView#{get,set}HttpAuthUsernamePassword"
2016-09-26 23:14:42 +00:00
Tobias Thierer
45716d6539
API changes for Locale to OpenJDK8u60 (part 1/2)
...
Bug: 29935305
Test: make update-api
Change-Id: I11f22dba5c795f7016c6dac950166ab749a7423d
2016-09-26 22:16:51 +01:00
Nate Fischer
c7edfb02bd
Deprecate WebView#{get,set}HttpAuthUsernamePassword
...
Deprecate these methods and move them to WebViewDatabase.
BUG: 31318603
Test: N/A
Change-Id: Ie4613e8de9c6120fa1d21263b15ef2467c6ccdef
2016-09-26 13:45:09 -07:00
Michael Wright
091ffac018
DO NOT MERGE Actually track generics in API definition.
...
Bug: 24265043
Test: make
Change-Id: Id5544c0f0cf32655f9c00a5cc3eca1cabb70170f
2016-09-26 19:38:14 +01:00
Michael Wright
515bf17cd2
Track generics in API definition.
...
Bug: 24265043
Test: make
Change-Id: Ida05c3eeb069a1e8db02cf024cec11536636b68d
2016-09-26 15:20:17 +01:00
Treehugger Robot
fe9357f6e7
Merge changes from topic 'aosp-generics-api'
...
* changes:
DO NOT MERGE Track generics in API definition.
DO NOT MERGE Fix issue #29871385 : Need JobScheduler.scheduleAsPackage to be system API
2016-09-26 14:04:57 +00:00
Kirill Grouchnikov
4b1983a379
Merge "Mark a hidden MotionEvent method to be visible for tests"
2016-09-26 13:07:14 +00:00
Andreas Gampe
50309b4644
resolve merge conflicts of 6e37f8a to master
...
Change-Id: I4fdcce7554977a56fd0f7e4ad4804929112d5599
2016-09-25 15:13:06 -07:00
John Reck
6c12392f17
Expose SurfaceTexture(boolean) constructor
...
Fixes: 31709954
Test: 'cts-tradefed run singleCommand cts-dev --module CtsUiRenderingTestCases --test android.uirendering.cts.testclasses.TextureViewTests' passes
Change-Id: I358ae97aa90b27ee5757271d83c8a5b96a31a3f0
2016-09-23 13:27:55 -07:00
Alan Viverette
6e37f8a077
Allow developer to override Material-style modes in picker dialogs am: 8817aa9339
...
am: 010ab618af
2016-09-23 19:43:39 +00:00
Svet Ganov
e8e8942dff
Add app op name string for a runtime permission
...
Change-Id: Iaf2d06212cef5e394034ea99f742fedb144a924d
2016-09-22 19:56:50 -07:00
Alan Viverette
8817aa9339
Allow developer to override Material-style modes in picker dialogs
...
A recent fix prevented developers from specifying Holo-style mode when
displaying a date or time picker dialog. This CL also cleans up unused
code in TimePickerDialog and documents how themeResId will be used.
Adds hidden @TestApi methods for use in CTS tests. These may be made
public later, but it's too late in MR1 for API changes.
Bug: 31586821
Test: Ice2e203983769f1ea1cfa93105eb97b6fa5176b9
Change-Id: I1b7512b7647ddd7ab987beac2c0aef4fe7cc16bc
2016-09-22 11:16:22 -04:00
Neil Fuller
99898356eb
Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d am: 3fa8bc066b am: 8ed37211bd
...
am: 025813ad65
2016-09-21 21:33:39 +00:00
Neil Fuller
cf0069734e
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" am: 0acc91e4fc am: 2d7008a71c am: a70325bced
...
am: f2fb7521ab
2016-09-21 21:26:19 +00:00
Neil Fuller
025813ad65
Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d am: 3fa8bc066b
...
am: 8ed37211bd
2016-09-21 16:46:25 +00:00
Neil Fuller
8ed37211bd
Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d
...
am: 3fa8bc066b
2016-09-21 16:28:46 +00:00
Neil Fuller
f2fb7521ab
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" am: 0acc91e4fc am: 2d7008a71c
...
am: a70325bced
2016-09-21 12:03:29 +00:00
Neil Fuller
a70325bced
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" am: 0acc91e4fc
...
am: 2d7008a71c
2016-09-21 11:58:27 +00:00
Neil Fuller
3243958460
Track API changes associated with AbstractMethod refactoring
...
No actual API change.
Bug: 28666126
Bug: 31052885
Test: make test-art-host and cts run of CtsLibcoreTestCases
Change-Id: I8755509f9b6e5387e071a3550b197167bab6ae04
2016-09-21 12:57:41 +01:00
Neil Fuller
3ead539c01
Tracking unhiding of java.lang.reflect.Parameter APIs
...
Bug: 28666126
Change-Id: I37926f8f221dca7e99ffd233a0990fcfa4d56040
2016-09-21 09:21:10 +00:00
Svetoslav Ganov
8b6456bc88
Merge "Move device serial behing a permission"
2016-09-21 03:32:47 +00:00
Julia Reynolds
90eba6d81c
Merge "Add Notification channels"
2016-09-16 15:35:27 +00:00
Jordan Liu
8a5ca10fd6
Merge "Add dial_string_replace key to CarrierConfig"
2016-09-15 22:53:56 +00:00
TreeHugger Robot
84024c1f09
Merge "Allow Condition Providers to bind/unbind themselves"
2016-09-15 21:29:10 +00:00
