Commit Graph

76520 Commits

Author SHA1 Message Date
Jean-Michel Trivi
dc36701751 Merge "Fix A11y volume persisting/restore" into oc-dev am: 076a0bd0bf
am: 350b39fbc8

Change-Id: I376101c1e68cdab01cdf3ee0db3bbe64b4bcd631
2017-04-14 16:16:46 +00:00
Bookatz
c2c9363c7a Merge "Collect background stats: syncs" into oc-dev am: a8fc7bff5a
am: 53b7ff2014

Change-Id: I30744a569a8617369e52c06de9b897128521cbb4
2017-04-14 16:11:50 +00:00
Jeremy Joslin
ce66b0d019 Merge "Add more NetworkRecommendationProvider documentation." into oc-dev am: 5879aa4b03
am: 9bcbf38e79

Change-Id: I6f57d8b0cc62b9ebe690e6d2efc5c725e90c8fe7
2017-04-14 16:10:34 +00:00
Adam Lesinski
08551954aa Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev am: 4124851b64
am: b8dc42fcf3

Change-Id: I4874c6683a150b98f8edcd4f1d5e60e69b39e457
2017-04-14 16:09:37 +00:00
Adam Lesinski
c7c66e7f78 Merge "Update docs for obtainStyledAttribute" into oc-dev am: 80b7a214ba
am: f8235c3631

Change-Id: I7235021ff618fd99f5f1470cbf6e7e64420788e2
2017-04-14 16:07:45 +00:00
Adam Lesinski
c96e4b0f76 Merge "BatteryStats: Remove reading of cpu power" into oc-dev am: af85d84050
am: 51d94c82af

Change-Id: I0bef2f7074a06f8336d727dd89c685c76262eca5
2017-04-14 16:04:32 +00:00
Dianne Hackborn
cc04f02b44 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev am: 29c70437b3
am: 76c71a01e2

Change-Id: Ieafe036ee6c2662d5897a8052facd3cd0d9fbed7
2017-04-14 16:01:58 +00:00
Chris Tate
d593e402c2 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev am: 117ac766a9
am: 636915a2ed

Change-Id: I28d8d31b30c9b500be1796566bb9885741b9aedc
2017-04-14 15:34:16 +00:00
Seigo Nonaka
659c9cfac3 Merge "Introduce setFallbackTypeface" into oc-dev am: 729a515e5e
am: 17452ee553

Change-Id: I66fe816727aae3fdf617c41796b25478090704fe
2017-04-14 15:31:25 +00:00
Roozbeh Pournader
20041c2d00 Merge "Switch i18n listeners to use IME hint locales" into oc-dev am: da97b66f41
am: 18fcf3f0d7

Change-Id: I43faa4ab695c52adf3c6d6f6170ffa5b6bc631f2
2017-04-14 13:15:32 +00:00
Chris Wren
12ac68a26f Merge "don't interpret milliseconds as nanoseconds" into oc-dev am: de12503268
am: a881fc2e2c

Change-Id: I6c803ec08b218203f3880cf0b2b269b3a6cb0692
2017-04-14 13:14:37 +00:00
Andrew Solovay
47cdd3d8e9 Merge "doc: Add note to Context.bindService()" into oc-dev am: 2c63aa3be7
am: 7cfe7cf19b

Change-Id: I6cd7cf2e25c0038afcf96a26ea2b8635a8ca7d95
2017-04-14 13:09:59 +00:00
Todd Lee
d5566c6c47 OEM single-build/multi-SKU via dynamic RRO support
The purpose here is to provide support for selectively
enabling Runtime Resource Overlays (RROs) (specifically
those pertaining to a specific SKU, within a OEM's "single
build" covering multiple SKUs) at boot based on the value
of a pre-defined system property.

This mechanism is designed to be compatible with other,
recent changes to Runtime Resource Overlays - specifically:

- has no effect on 'isStatic'. Resource overlays must be
  attributed as static in order to qualify for loading into
  the system_server. The 'requiredSystemPropertyName/
  requiredSystemPropertyValue' mechanism operates
  independent of this and can be used on both static and
  non static overlays. The effect of specifying a conditional
  property on any overlay is that it will ONLY be enabled
  in the event that the system reflects both the property
  and the specified value (Note that in the ABSENCE of a
  conditional property, overlays are assumed to be enabled).

- has no effect on OverlayManagerService (OMS) API. The
  OMS provides the system with an interface through which
  overlays can be enabled/disabled and even rearranged at
  runtime. This provides the basis of support for various
  user-level features (e.g. dynamic theme selection).
  The 'requiredSystemPropertyName/requiredSystemPropertyValue'
  mechanism operates independent of this -
  with enablement being completely coupled to the available
  system properties on the device and NOT subject to change
  at runtime.

Note: as part of this change, original overlay tests have been
updated (fixed) and expanded to include tests to cover the
conditional property implementation.

Issue: http://b/35100249
Test: frameworks/base/core/tests/overlaytests/testrunner.py

Change-Id: I1990ce21a27a385db1e2f53294b69dd03988351e
2017-04-13 19:33:11 -07:00
TreeHugger Robot
f9993a7b44 Merge "Add EXTRA_WIPE_ESIMS for factory reset of eSIM" 2017-04-14 02:04:01 +00:00
qingxi
240c2bb621 Add EXTRA_WIPE_ESIMS for factory reset of eSIM
EXTRA_WIPE_ESIMS will be set as true when the user chooses to wip eSIM
information during factory reset. This will be handled by
MasterClearReceiver.

Bug: 37255419
Test: Test on phone
Change-Id: Ic2e4a6af8f9a9f3854f33eb9eeaf9b052e47e1b6
2017-04-13 16:26:06 -07:00
Jean-Michel Trivi
350b39fbc8 Merge "Fix A11y volume persisting/restore" into oc-dev
am: 076a0bd0bf

Change-Id: Ida09a7781114812adbb4536fac53a3773cd69dc4
2017-04-13 21:40:36 +00:00
Jean-Michel Trivi
076a0bd0bf Merge "Fix A11y volume persisting/restore" into oc-dev 2017-04-13 21:32:06 +00:00
Bookatz
53b7ff2014 Merge "Collect background stats: syncs" into oc-dev
am: a8fc7bff5a

Change-Id: Id3f2d7b2a77c74657416e492519f2205bc46218a
2017-04-13 21:31:05 +00:00
TreeHugger Robot
a8fc7bff5a Merge "Collect background stats: syncs" into oc-dev 2017-04-13 21:20:14 +00:00
Jeremy Joslin
9bcbf38e79 Merge "Add more NetworkRecommendationProvider documentation." into oc-dev
am: 5879aa4b03

Change-Id: I4e41346ea4dd9a731f8747c3e447deb0a991fc3d
2017-04-13 21:04:53 +00:00
Adam Lesinski
b8dc42fcf3 Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev
am: 4124851b64

Change-Id: I2bdfbdbe4e08e4b10b0fe7a2d0ed813f29d72fe7
2017-04-13 21:03:53 +00:00
TreeHugger Robot
5879aa4b03 Merge "Add more NetworkRecommendationProvider documentation." into oc-dev 2017-04-13 20:55:55 +00:00
TreeHugger Robot
4124851b64 Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev 2017-04-13 20:54:30 +00:00
Adam Lesinski
f8235c3631 Merge "Update docs for obtainStyledAttribute" into oc-dev
am: 80b7a214ba

Change-Id: I66c85d892d708176f2cef6a6ef2b698976d649c9
2017-04-13 20:34:34 +00:00
Adam Lesinski
51d94c82af Merge "BatteryStats: Remove reading of cpu power" into oc-dev
am: af85d84050

Change-Id: I671a51d53c035d40cb1af1428f7c0f4093445aed
2017-04-13 20:22:19 +00:00
TreeHugger Robot
80b7a214ba Merge "Update docs for obtainStyledAttribute" into oc-dev 2017-04-13 20:15:51 +00:00
Dianne Hackborn
76c71a01e2 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev
am: 29c70437b3

Change-Id: I5078d76e3eb861850ef7af769badf81dbdee418a
2017-04-13 20:15:05 +00:00
Adam Lesinski
af85d84050 Merge "BatteryStats: Remove reading of cpu power" into oc-dev 2017-04-13 20:09:51 +00:00
TreeHugger Robot
29c70437b3 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev 2017-04-13 20:01:32 +00:00
Chris Tate
636915a2ed Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev
am: 117ac766a9

Change-Id: I9bec0f90873a5bcb9ff89eadcf7e334e9f0afb89
2017-04-13 19:45:30 +00:00
Jack He
aadf525e1a Merge "Add developer setting and system API for inband ringing support" into oc-dev 2017-04-13 19:43:54 +00:00
Seigo Nonaka
17452ee553 Merge "Introduce setFallbackTypeface" into oc-dev
am: 729a515e5e

Change-Id: I3e88a1d51b8a8be7f932964917218a28ae23c5c9
2017-04-13 19:38:09 +00:00
Chris Tate
117ac766a9 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev 2017-04-13 19:24:13 +00:00
TreeHugger Robot
729a515e5e Merge "Introduce setFallbackTypeface" into oc-dev 2017-04-13 19:21:25 +00:00
Jean-Michel Trivi
a53b7051a2 Fix A11y volume persisting/restore
When the accessibility volume is enabled, its value wasn't persisted
  when changed because it was still using the persisting name from
  its alias (music).
When enabled, notiify the volume controller that a11y volume has
  changed so the UI also reflects the new value, now updated from
  the persisted settings.
Do not persist volumes for streams that don't have a setting name.

Test: enable Talkback, set a11y volume at a different level than media \
  then disable Talkback. Reboot and enable Talkback, verify a11y is \
  restored.
Bug: 36286073

Change-Id: Ic6c30364e164b856fc10fbf6b22c09a7b5561be1
2017-04-13 12:04:15 -07:00
Bookatz
2bffb5bb3a Collect background stats: syncs
Added background times and counts for an app's sync usage.

Bug: 35669746
Test: runtest -x
frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java

Change-Id: I1c01c5044064277b97e8d330386454da3e8204da
2017-04-13 11:59:33 -07:00
Adam Lesinski
41a2fb1c75 Add example to TypedValue.changingConfigurations JavaDoc
Also includes a list of possible bits that can be set.

Bug: 36676115
Change-Id: I84fd374a00debb4647719e62cf5a1ef22bb6071c
Test: builds
2017-04-13 11:39:50 -07:00
Roozbeh Pournader
18fcf3f0d7 Merge "Switch i18n listeners to use IME hint locales" into oc-dev
am: da97b66f41

Change-Id: I9db037d0566c35c12aaed5e3f509498ca498b34f
2017-04-13 18:33:57 +00:00
Chris Wren
a881fc2e2c Merge "don't interpret milliseconds as nanoseconds" into oc-dev
am: de12503268

Change-Id: I51eb680e3e966577e30647b6529e900894da60c4
2017-04-13 18:31:49 +00:00
Steve McKay
0b28e794de Merge "Remove support for auto-paging of cursors." into oc-dev
am: 7f0d8c8076

Change-Id: Ice100c419ce6d53721d6bbec1147bb1cc1bb7b4d
2017-04-13 18:26:43 +00:00
TreeHugger Robot
da97b66f41 Merge "Switch i18n listeners to use IME hint locales" into oc-dev 2017-04-13 18:23:05 +00:00
Daichi Hirono
8bf30a7826 Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev
am: 73b54bfd6d

Change-Id: I5969b9ec58b1d9d9baf3f9a9e4bd87678416e469
2017-04-13 18:21:18 +00:00
TreeHugger Robot
de12503268 Merge "don't interpret milliseconds as nanoseconds" into oc-dev 2017-04-13 18:18:26 +00:00
TreeHugger Robot
7f0d8c8076 Merge "Remove support for auto-paging of cursors." into oc-dev 2017-04-13 18:12:14 +00:00
TreeHugger Robot
73b54bfd6d Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev 2017-04-13 18:11:48 +00:00
Dianne Hackborn
f66adfd1cd Add new facility to find out when a PendingIntent is canceled.
This is just an internal API in the platform, not (yet?) available
in the SDK.  But it will be useful for system services that want to
clean up state if a pending intent that has been registered with them
is canceled (either explicitly by the app, through the app being
uninstalled, etc).

Also improve the activity manager's dump of pending intents to
organize them by package, making it much easier to read (now that
we have so many active pending intents these days).

Test: ran and booted.  no CTS, since no API.

Change-Id: Iad029cfedcd77e87357eca7da1b6ae94451dd981
2017-04-13 11:04:30 -07:00
Andrew Solovay
7cfe7cf19b Merge "doc: Add note to Context.bindService()" into oc-dev
am: 2c63aa3be7

Change-Id: I35b4a37abc8573340811a0ca5f9fd479ae5f20e3
2017-04-13 17:57:51 +00:00
Seigo Nonaka
b87a2f041d Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev am: d09be1c0e9
am: 284944c7f8

Change-Id: Idae84335677a859641b6660589848e04b4a38474
2017-04-13 17:57:46 +00:00
Andrew Solovay
2c63aa3be7 Merge "doc: Add note to Context.bindService()" into oc-dev 2017-04-13 17:46:16 +00:00
Dave Friedman
293ac8cef2 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d am: f125662db1 am: 27aeab9763
am: 85b7a34094

Change-Id: I680e6828c66babf4d6e7bae3fd76f1015d2f209a
2017-04-13 17:43:02 +00:00