Commit Graph

63456 Commits

Author SHA1 Message Date
Felipe Leme
3b91df7ccf Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev
am: 2c6a450fa2

* commit '2c6a450fa23b97e6082e2daa1aa9c7f07a4def8f':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Id9cb27070e1e72b12c5ade60b637e63319021f90
2016-05-17 18:39:02 +00:00
Martijn Coenen
225d221945 Merge "Adddress NFC API review comments." into nyc-dev
am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ib327612766f91c583ea0a23e71bac34615edd12d
2016-05-17 18:38:40 +00:00
Dianne Hackborn
4d7e92b56b Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iaf3102ba03cf2242b02030aa24df8282ed3fbdc8
2016-05-17 18:38:28 +00:00
TreeHugger Robot
2c6a450fa2 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00
Martijn Coenen
1fef88d8dc Merge "Adddress NFC API review comments." into nyc-dev 2016-05-17 18:21:16 +00:00
Dianne Hackborn
607844efa5 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 2016-05-17 18:19:36 +00:00
Michael Kwan
59bce44aaa Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 2016-05-17 18:03:38 +00:00
Makoto Onuki
8295332d83 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 2016-05-17 18:01:29 +00:00
Robin Lee
0867543a06 Merge "Make some of the UID-based VPN code reusable" into nyc-dev
am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I0e5b9aa4552ee11ae5ec2d2206cc58487fb9cd4c
2016-05-17 17:39:14 +00:00
Phil Weaver
bcaaac3ea1 Merge "Hide UiAutomation#destroy as test api." into nyc-dev
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: Ie68602fc2b301430dcfa98d4b61515f2014db71a
2016-05-17 17:36:17 +00:00
TreeHugger Robot
4920698e17 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 2016-05-17 17:30:01 +00:00
Phil Weaver
89d3ba72b7 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 2016-05-17 17:27:01 +00:00
Phil Weaver
bc176c4fbf Merge "Content description for FloatingToobar overflow." into nyc-dev
am: 43141e33f7

* commit '43141e33f7e7da5b7514549cf23f5228915f11d8':
  Content description for FloatingToobar overflow.

Change-Id: I6118131870a8c3bfa51befa9973808fadfa9caf6
2016-05-17 17:16:46 +00:00
Phil Weaver
43141e33f7 Merge "Content description for FloatingToobar overflow." into nyc-dev 2016-05-17 17:08:29 +00:00
Zoltan Szatmary-Ban
fc66ec971c Merge "Introduce system API to get source of user restriction" into nyc-dev
am: 690c2ea117

* commit '690c2ea117f90b7759ac280a1c84f5966b1e7938':
  Introduce system API to get source of user restriction

Change-Id: Iab98753f85774d741c5126395d56af194c8b0ca8
2016-05-17 15:23:59 +00:00
Zoltan Szatmary-Ban
690c2ea117 Merge "Introduce system API to get source of user restriction" into nyc-dev 2016-05-17 15:16:56 +00:00
Sergio Giro
a9f804bf41 Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev
am: 5a68af3840

* commit '5a68af384037f2980215dd45b91c5165c779d4e8':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I3cf53b5125331fc3c59183c09c79516a98a62347
2016-05-17 11:10:54 +00:00
Sergio Giro
5a68af3840 Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev 2016-05-17 11:02:20 +00:00
Sergio Giro
6cb7b1c476 ZygoteInit: warm up JCA providers during preload
This makes the time spent in the first call of an app to
SSLSocketFactory.getDefault() drop from ~240 ms to ~50 ms. In M
it was around ~6ms. This is due to the fact that, while instantiating
the default factory, all providers are initialized.

In order to obtain the timings above, I created an app calling
SSLSocketFactory.getDefault in onCreate and timed it
with System.currentTimeMillis() .

Bug: 28545496

Change-Id: I650d4b0435e67e481a41e02b0b538ce5cc993fa3
2016-05-17 10:02:09 +00:00
Clara Bayarri
ec200415f5 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
am: bee2648027

* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: I2efdcb8828da9a455dc80911c3aa87ac7ec6eab5
2016-05-17 09:20:43 +00:00
Clara Bayarri
bee2648027 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 2016-05-17 09:12:36 +00:00
Martijn Coenen
6136730e3b Adddress NFC API review comments.
Bug: 28775492
Change-Id: I01befba3435f0d882787fecabd3c1041fe7260d7
2016-05-17 09:09:15 +02:00
Christopher Tate
d4056a279d Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev
am: 11d9586117

* commit '11d9586117e983e36b2467bcb436200268cd0933':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I7c894dd6dc494dc5c02ba9e9676b53b0acc281d4
2016-05-17 01:03:59 +00:00
Wale Ogunwale
273d6e8f56 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I81250af945c186fbb687bc15ec03a85a019bd6e3
2016-05-17 00:59:36 +00:00
Chris Tate
11d9586117 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev 2016-05-17 00:56:49 +00:00
TreeHugger Robot
b406dd20ee Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 2016-05-17 00:51:41 +00:00
Jorim Jaggi
4958217aa4 Handle multi-window for inset hint
am: 23bf5462f0

* commit '23bf5462f05b33ce4390d8370520e43b74dbec09':
  Handle multi-window for inset hint

Change-Id: I67d202891330ba78b6fbe62510261cc7f1449b42
2016-05-16 23:27:56 +00:00
Wale Ogunwale
3b23239d6e Fixed bugs with starting windows when displayng forcedResized activity
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.

Bug: 28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
2016-05-16 16:27:01 -07:00
Makoto Onuki
20c95f854e ShortcutManager: API changes for DR
See https://goto.google.com/shortcutmanager-spec-dr for
the details.

This CL contains changes to ShortcutInfo and all the new API
entry points, but not the implementation of the new APIs.

- ShortcutInfo.activityComponent is now mandatory.
- Publishers can now disable shortcuts.  ShortcutInfo can now have
"disabled message".
- ShortcutInfo now supports string resources for all the String
fields.
  -> When launcher fetches shortcuts, ShortcutService will
  automatically load resources and expose as strings.
- LauncherApps now supports getShortcutIconDrawable() and
getShortcutBadgedIconDrawable() to be consistent with
LauncherActivityInfo.

- ShortcutInfo.weight is replaced with "rank".

- Added ShortcutManager.reportShortcutUsed(), which will be used for
usage tracking / suggestion.

Bug 28536054
Bug 28536066
Bug 28564134
Bug 28594168

Change-Id: Ib8245b39bb1e753991a9de89c0b73accacd90355
2016-05-16 16:25:50 -07:00
Jorim Jaggi
23bf5462f0 Handle multi-window for inset hint
We need to incorporate task bounds when calculating the inset hint
so we don't specify something wrong to the client which we correct
immediately after.

Bug: 28697105
Change-Id: I23cec7d6cc62a4d982e0796a867e803d4cce0803
2016-05-16 23:18:14 +00:00
Svetoslav Ganov
5f8c5ec9a4 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev
am: 008d73bd5b

* commit '008d73bd5b3ca4b1b7a8af61957759d65dd67e3b':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: Iebbe27690aeac898807c13ef05c730697dbb406a
2016-05-16 22:48:35 +00:00
Svetoslav Ganov
008d73bd5b Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev 2016-05-16 22:42:49 +00:00
Michael Kwan
cc6e6f0e0a Modified AlertController to allow themes to specify custom implementation.
Bug: 17733928
Change-Id: I0264ee8ceee09dbc33da61365c424c74d2e3c3d6
2016-05-16 15:36:22 -07:00
Svetoslav Ganov
a8bbd76d9b Ensure app op restrictions reset when the app that set them dies.
We were not keeping track when an app that set an app op restriction
dies to clean up after that. As a result we may end up with stale
restrictions that will be there until the device reoots - not cool.
This change adds remote binder death tracking and simplifies the
code as adding the formed would have made more complex.

bug:28770536

Change-Id: I7dcaafba2354843a0cdf0206ab1f96625edc5120
2016-05-16 15:34:34 -07:00
Felipe Leme
d028ec4e29 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: I1187ffeeb42b61329674ca022735efa08c7e9d98
2016-05-16 22:23:46 +00:00
TreeHugger Robot
522787f39a Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 2016-05-16 22:17:42 +00:00
Vladislav Kaznacheev
4695fae868 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev
am: a423ec52ac

* commit 'a423ec52ac427e5bdbd12aac21ef75eff7d96140':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I5d87956bf0fe48acf66d577d8531e2669ec5b001
2016-05-16 21:26:09 +00:00
TreeHugger Robot
a423ec52ac Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 2016-05-16 21:21:58 +00:00
Felipe Leme
c9c7be58a5 Documented return value of getRestrictBackgroundStatus().
Change-Id: I2c15a6d5e23cbc3c9b59c975196c1c04c1294471
Fixes: 28775490
2016-05-16 13:57:19 -07:00
Ta-wei Yen
ca2da6dc33 Merge "Add visual voicemail SMS filter APIs" into nyc-mr1-dev 2016-05-16 20:36:37 +00:00
Felipe Leme
99d5d3d775 Added a onRestrictBackgroundBlacklistChanged() callback.
When an UID is added / removed to the Data Saver blacklist, it's
necessary to notify internal components such as the Settings UI (which
was erroneously listening to UID rules changes instead).

BUG: 28743623
BUG: 28791717

Change-Id: I11c85e141dfe074ad390fd324309d2412bfbbd45
2016-05-16 13:30:57 -07:00
Vladislav Kaznacheev
c244970220 Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.
Make getX/getY return view-relative position as specified in the class
JavaDoc.

Fix obvious errors in JavaDoc for getX/getY

Bug: 28793547
Change-Id: Ic2ac646189711e7466594d4fc8326408fc0348e1
2016-05-16 12:57:15 -07:00
Phil Weaver
e6269c3f1d Hide UiAutomation#destroy as test api.
Bug: 28771617
Change-Id: Ib113883d3d12fc6a9e8c038e2c4eb1731b026b38
2016-05-16 12:55:08 -07:00
Alan Viverette
f10697e17b Merge "Update docs for ColorStateList to include alpha" into nyc-dev
am: 5bcf7650b4

* commit '5bcf7650b492ca9ce5b685c5e0f535b5927af0c6':
  Update docs for ColorStateList to include alpha

Change-Id: I1dc16f964509cec422622da2ac60e5428b8203f6
2016-05-16 19:40:26 +00:00
Alan Viverette
97306713fe Merge "Use standalone capitalization for month labels" into nyc-dev
am: 895241170b

* commit '895241170b017235faf9a6a77afd22b12209bce6':
  Use standalone capitalization for month labels

Change-Id: I881afd0f2decf329e11e103c92dc54584b91ac54
2016-05-16 19:40:23 +00:00
Alan Viverette
5bcf7650b4 Merge "Update docs for ColorStateList to include alpha" into nyc-dev 2016-05-16 19:30:38 +00:00
Ta-wei Yen
349f4eddf7 Add visual voicemail SMS filter APIs
Added the following APIs to the framework:
VoicemailContracts.ACTION_VOICEMAIL_SMS_RECEIVED
VoicemailContracts.EXTRA_VOICEMAIL_SMS_TYPE
VoicemailContracts.EXTRA_VOICEMAIL_SMS_DATA
VoicemailContracts.EXTRA_VOICEMAIL_SMS_SUBID

TelphonyManager.setVisualVoicemailSmsFilterEnabled()
TelphonyManager.isVisualVoicemailSmsFilterEnabled()
TelphonyManager.setVisualVoicemailSmsFilterPrefix()
TelphonyManager.getVisualVoicemailSmsFilterPrefix()
TelphonyManager.setVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.getVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.setVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.getVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_ANY
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_DATA_SMS

These values are required to implement the VisualVoicemailSmsFilter in
frameworks/opt/telephony

All of the APIs are hidden.

Bug:27816386
Bug:27817303
Change-Id: I07736785da5fece84d1f3d27f270ac6fa94c1c56
(cherry picked from commit ecbcce11ce)
2016-05-16 17:37:48 +00:00
Alan Viverette
c3e5a82691 Use standalone capitalization for month labels
Bug: 28020439
Change-Id: I85169a78142a43ff2348e0b561a7aa995544a65e
2016-05-16 13:35:56 -04:00
Clara Bayarri
ab591ba4b6 Remove "if it succeeds" wording from requestShowKeyboardShortcuts
Bug: 28775576
Change-Id: Ib7bc2d78cc074c14384f5a86437c684462f1fb54
2016-05-16 17:48:16 +01:00
Phil Weaver
1d4e18340e Content description for FloatingToobar overflow.
Was missing a content description. The same button is used for
both opening and closing the toolbar, so it needs to be updated
dynamically.

Bug: 28750935
Change-Id: I7f75701ae6af45e5621c36b81003b658479e8b31
2016-05-16 09:41:14 -07:00