Commit Graph

14527 Commits

Author SHA1 Message Date
Andreas Gampe
50309b4644 resolve merge conflicts of 6e37f8a to master
Change-Id: I4fdcce7554977a56fd0f7e4ad4804929112d5599
2016-09-25 15:13:06 -07:00
Alan Viverette
6e37f8a077 Allow developer to override Material-style modes in picker dialogs am: 8817aa9339
am: 010ab618af

Change-Id: I0d68842adb7097f4d32977f31d80a10bc166c045
2016-09-23 19:43:39 +00: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

Change-Id: I496b31b959873bd0dd5b8a80b7e54cbb6e918791
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

Change-Id: Idefa7729bb23b804cfc4d52456e3f20738a542fe
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

Change-Id: I4771be30b206c9f36e5127608c0f27d5bfb6b0ae
2016-09-21 16:46:25 +00:00
Neil Fuller
8ed37211bd Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d
am: 3fa8bc066b

Change-Id: I4931c55a7390f2d186821f1f734af1f42a0a9798
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

Change-Id: If4fbdf31e9b6c2cf418acb67866fb4096f1a0049
2016-09-21 12:03:29 +00:00
Neil Fuller
a70325bced Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" am: 0acc91e4fc
am: 2d7008a71c

Change-Id: I931f4f0f5d9be7b11725ab42f5eefcb2770d70b6
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
Phil Weaver
be2b372069 Merge "Reduce overhead of obtain/recycle a11y checking." 2016-09-15 19:53:31 +00:00
Julia Reynolds
38e6ca4e74 Allow Condition Providers to bind/unbind themselves
So they only run when needed.

Change-Id: I5cf3a572837cb773dcb4f278a9f86a9d909147e4
Fixes: 30727598
2016-09-15 19:31:29 +00:00
Phil Weaver
62d20fabf2 Reduce overhead of obtain/recycle a11y checking.
Change-Id: I643ab028aa23c4727b9e0be0db83238034a23960
2016-09-15 11:05:55 -07:00
Julia Reynolds
b5e44b7966 Add Notification channels
In this iteration:
-Every app gets a default channel that notifications will be posted
to if they don't specify a channel themselves. The default channel
inherits app-wide settings on upgrade.
-Apps can create new channels without user approval, but apps
cannot change the name of a channel once created, nor can they ever
set the importance.
- When a notification is posted:
  - If the channel is marked as 'vibrates', vibration will be
    applied to notifications that lack a vibration. unlike the default
    notification flag, notifications will retain their custom vibration
    if given
  - Same with sound and lights
  - A notification's importance is the min of the app and channel
    importance
  - A notification can bypass dnd if: either the app or channel settings
    say it can
  - A notification's show on lockscreen setting comes from the app first,
    and the channel second if the app has no preference

Tests: in cl. also there's a cl for cts and a test app.

Change-Id: I630f99df655800b00586dcfab538d320d04fe0f0
2016-09-15 08:42:35 -04:00
Jordan Liu
02ec2a0c2a Add dial_string_replace key to CarrierConfig
Add KEY_DIAL_STRING_REPLACE_STRING_ARRAY and default value (null) 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/17202092. We specify a map from
dialstrings to replacements for roaming network service numbers which
cannot be replaced on the carrier side.

Bug: 29873049
Change-Id: I852261596d3931f38d5f1c6b3d24ffe27f950458
2016-09-14 15:36:55 -07:00
Jordan Liu
e166356fe2 Add cdma_3waycall_flash_delay key to CarrierConfig
Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

Bug: 29873049
Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0
2016-09-14 14:51:07 -07:00
Kirill Grouchnikov
33d21b1a7a Merge "Mark a hidden MotionEvent method to be visible for tests" 2016-09-14 21:39:14 +00:00
Jordan Liu
c0b0e761d5 Merge "Add key to CarrierConfig" 2016-09-14 21:27:29 +00:00
Jordan Liu
2be612f806 Merge "Add key to CarrierConfigManager" 2016-09-14 18:17:16 +00:00
Kirill Grouchnikov
c0b0ba5532 Mark a hidden MotionEvent method to be visible for tests
This allows CTS coverage for MotionEvent.getActionButton.

Bug: 31441257
Change-Id: I9e9c9462a09f9ea82bb17cb53dc70c42fb4759e7
2016-09-13 17:28:56 -07:00
TreeHugger Robot
bdff0542ec Merge "Implementing ContactNameColumns in PhoneLookup too" 2016-09-13 21:42:44 +00:00
Hyundo Moon
53fcb68f89 Merge "MediaSession: Rename methods related to shuffle mode" 2016-09-13 00:25:23 +00:00
Ariel Gertzenstein
4f52fe2336 Merge "Add api to WearableExtender for setting and getting the bridge tag. Make a change in the comment of setDismissalId." 2016-09-12 21:36:56 +00:00
Jordan Liu
a5a8b59333 Add key to CarrierConfig
Add RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION and default value
(false) to CarrierConfigManager, and remove the old configs.

This value exists because:
http://b/10131736, requires radio restart.
http://b/16308209, http://b/17567651 require that we do not restart.

Bug: 29873049
Change-Id: I4e199d7fe73b82fa39475f31825e5b8ae58d180f
2016-09-12 14:00:37 -07:00
Kirill Grouchnikov
29840f30b1 Merge "Javadocs fixes for deprecated methods on OverScroller" 2016-09-12 17:13:15 +00:00
Hyundo Moon
934a526e68 MediaSession: Rename methods related to shuffle mode
This CL remames following methods:
 - MediaController.getShuffleMode() -> isShuffleModeEnabled()
 - MediaController.TransportControls.setShuffleMode()
    -> setShuffleModeEnabled()
 - MediaSession.setShuffleMode() -> setShuffleModeEnabled()
 - MediaSession.Callback.onSetShuffleMode() -> onSetShuffleModeEnabled()

Change-Id: Ifb1ef5b5355ddec60c3e9e84d53eb4ead4671b4f
2016-09-12 21:15:41 +09:00
Svet Ganov
37e43275ee Move device serial behing a permission
Build serial is non-user resettable freely available deivice
identifier. It can be used by ad-netowrks to track the user
across apps which violates the user's privacy.

This change deprecates Build.SERIAL and adds a new Build.getSerial()
API which requires holding the read_phone_state permission.
The Build.SERIAL value is set to "undefined" for apps targeting
high enough SDK and for legacy app the value is still available.

bug:31402365

Change-Id: Iddd13430b2bd1d9ab4966e31038ecabdbdcec06d
2016-09-11 18:44:38 +00:00
Eino-Ville Talvala
1a64580308 Camera2: Unhide deferred surface configuration APIs
To speed up camera startup, allow setting up a camera capture session
before all the output Surfaces are available (but their eventual sizes
and types are known). Also allow images to be captured to the
non-deferred outputs even before the deferred outputs are available.

This allows parallelizing of camera startup and UI layout.

Test: android.hardware.camera2.cts.SurfaceViewPreviewTest#testDeferrredSurfaces 
passes
Bug: 31319716
Change-Id: I657efc39bb8cc2d4bf201e5d70807a227ef82dde
2016-09-08 21:59:16 +00:00
John Reck
b5c30800e5 Merge "Add API to copy a window" 2016-09-08 16:23:45 +00:00
Tobias Thierer
74784e8e57 Merge "Add Base64 from OpenJDK 8u60" am: 63a07e80d6 am: 24bd141ce0 am: 8cdc25b4b3
am: e1edfb3008

Change-Id: I679230e9b91e5fa2325bc29b952d8a04af7e39a3
2016-09-08 13:39:00 +00:00
Tobias Thierer
e1edfb3008 Merge "Add Base64 from OpenJDK 8u60" am: 63a07e80d6 am: 24bd141ce0
am: 8cdc25b4b3

Change-Id: I83723322bfd4db3290fd831210ba1fc03c51e22a
2016-09-08 13:31:09 +00:00
Tobias Thierer
8cdc25b4b3 Merge "Add Base64 from OpenJDK 8u60" am: 63a07e80d6
am: 24bd141ce0

Change-Id: I15b2aaaf8d6791d4a561fa935c7ab960ac22c4d8
2016-09-08 13:26:11 +00:00
Tobias Thierer
63a07e80d6 Merge "Add Base64 from OpenJDK 8u60" 2016-09-08 13:10:15 +00:00
Sergio Giro
59c847d23a Merge "java.security.Provider: port to jdk8u60 (second part)" am: 8445702920 am: 81749ef47f am: fc0ee229bb
am: 374edfe1f7

Change-Id: I213a816da328c9aad0c5d39ad89aa17355419745
2016-09-08 12:42:49 +00:00
Sergio Giro
374edfe1f7 Merge "java.security.Provider: port to jdk8u60 (second part)" am: 8445702920 am: 81749ef47f
am: fc0ee229bb

Change-Id: I6b998e9a89c75f4869fcae144a8ce8b7ea40bb34
2016-09-08 12:37:44 +00:00
Sergio Giro
fc0ee229bb Merge "java.security.Provider: port to jdk8u60 (second part)" am: 8445702920
am: 81749ef47f

Change-Id: I6c3b6601f061ee644a9cbcc3f1bb2b8aefcd103d
2016-09-08 12:32:42 +00:00
Sergio Giro
8445702920 Merge "java.security.Provider: port to jdk8u60 (second part)" 2016-09-08 12:18:43 +00:00
Yi Kong
150e0e704d Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f" am: 3bc37e9cf7 am: b2d6acaa2b am: 541b91fe64
am: c0579c5fb7

Change-Id: Ida58d28751768127be7db940d73f521c21f8a86c
2016-09-08 10:23:05 +00:00
Yi Kong
c0579c5fb7 Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f" am: 3bc37e9cf7 am: b2d6acaa2b
am: 541b91fe64

Change-Id: I34d1dbc11268b935cd61204954ce56248346f888
2016-09-08 10:17:57 +00:00
Yi Kong
541b91fe64 Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f" am: 3bc37e9cf7
am: b2d6acaa2b

Change-Id: I756b0c2366737f22447ead5f26435ffb4b0425cb
2016-09-08 10:12:54 +00:00
Jordan Liu
3ff30d224b Add key to CarrierConfigManager
Add KEY_DEFAULT_VM_NUMBER_STRING and default value. Note that default
vm number no longer needs to be a string array, as gid is handled
within the new carrier_configs. Remove references to old config.

Bug: 29873049
Change-Id: I56e4e3713c27f449fd892db501b6097c8c89c3c6
2016-09-07 13:31:38 -07:00
John Reck
9580146f50 Add API to copy a window
Change-Id: I9bb5209010db6665be4b6f8db81a6fc1b7debc45
2016-09-07 11:41:15 -07:00
Yi Kong
a4cc9028bf Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f
Bug: 30992227
Change-Id: I33c25562468f5803e211910f50116b501b66fe56
2016-09-07 16:17:55 +00:00
Kirill Grouchnikov
cdac515398 Javadocs fixes for deprecated methods on OverScroller
Change-Id: I73aebc4727df394195d1b98e73a256d6420c3a7b
2016-09-07 08:40:54 -07:00
Sergio Giro
51c1b3466a Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba am: 6c753ca336 am: c0f7d4c65b
am: ff14a693b9

Change-Id: I240cbc0a38f4b90a93678a2a41428228936b733e
2016-09-07 12:44:28 +00:00