Commit Graph

74596 Commits

Author SHA1 Message Date
Hemant Gupta
87d48cdeae Merge "Bluetooth: Expose L2CAP API to support OPP 1.2" am: 79eb213a98 am: 12358b4057
am: 31428b1e6d

Change-Id: Ic2ff9eb34ebc8aada030f5e3e8d040c29f9b7186
2017-03-08 00:48:54 +00:00
Hemant Gupta
12358b4057 Merge "Bluetooth: Expose L2CAP API to support OPP 1.2"
am: 79eb213a98

Change-Id: I5f82a0c40c64fca0701abba44693b2892209acf3
2017-03-08 00:38:14 +00:00
Treehugger Robot
79eb213a98 Merge "Bluetooth: Expose L2CAP API to support OPP 1.2" 2017-03-08 00:28:31 +00:00
Dianne Hackborn
3744d8ba14 Merge "Fix issue #35813125: API Review: android.os > Bundle" 2017-03-07 23:30:33 +00:00
Dianne Hackborn
11e8636889 Merge "Fix issue #35813031: API Review: RemoteCallbackList" 2017-03-07 23:30:04 +00:00
TreeHugger Robot
aae1cc597d Merge "Expose Instant App API defined in MR1" 2017-03-07 23:20:53 +00:00
TreeHugger Robot
22b3c1b185 Merge "Allow disk writes on main thread in SharedPrefs" 2017-03-07 23:02:25 +00:00
TreeHugger Robot
1966cccd32 Merge "Keep Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED updated." 2017-03-07 23:01:50 +00:00
Daniel Nishi
8603ad42df Merge "Use the fast track for the AppCollector." 2017-03-07 22:55:20 +00:00
Amith Yamasani
a94c4b5b2e Merge "Collect background network data stats in BatteryStats" 2017-03-07 22:40:49 +00:00
TreeHugger Robot
eef77e398a Merge changes from topic 'b/34853980'
* changes:
  Camera: Add createCustomCameraSession to system API.
  CameraDevice: Add hidden createCustomCaptureSession
2017-03-07 22:19:51 +00:00
Julia Reynolds
3d91f1109b Allow channels to be renamed.
Because string resource ids aren't stable.

Test: runtest systemui-notification
Change-Id: Iaaa07b8c8cc1c8c321c7fedbfe1e252b4c1153dd
2017-03-07 21:23:12 +00:00
Calin Juravle
b1818b8a36 Merge "PackageManager: Clean up code related to foreign dex use"
am: eef66fd0c7

Change-Id: I443f001c15daddd63a17685c2e82fc9a619c45ee
2017-03-07 21:23:03 +00:00
Calin Juravle
eef66fd0c7 Merge "PackageManager: Clean up code related to foreign dex use" 2017-03-07 21:13:15 +00:00
Doris Liu
e7d258eb9b Merge "Ensure behavior consistency for 0 duration scale" 2017-03-07 21:01:47 +00:00
Adrian Roos
805dfb836a Merge "Revert "AOD: Refactor always on configuration"" 2017-03-07 20:53:25 +00:00
Adrian Roos
c45944b680 Revert "AOD: Refactor always on configuration"
This reverts commit 28d26a821f.

Bug: 36027947
Change-Id: I3d4c2e58b753120ff668a4594f60692abc6a3426
2017-03-07 20:21:47 +00:00
TreeHugger Robot
9165948219 Merge "Retry SECURITY_LOGS_AVAILABLE if DO doesn't request the logs" 2017-03-07 20:21:29 +00:00
Todd Kennedy
9c9fdf27ff Expose Instant App API defined in MR1
These were created in MR1 but couldn't be submitted because
they were defined too late [after API freeze].

Change-Id: Ie6884236776bd26e9d0b557fd125b8c77b0ad93b
Fixes: 34890162
Fixes: 35193180
Fixes: 35193418
Test: manual
2017-03-07 11:40:59 -08:00
Calin Juravle
4c06f55f14 PackageManager: Clean up code related to foreign dex use
We simplified the way we track whether or not a dex file is used by
other apps. DexManager in the framework keeps track of the data and we
no longer need file markers on disk.

Test: device boots, foreign dex markers are not created anymore

Bug: 32871170

(cherry picked from commit 74f0a3450c)

Change-Id: I2a9daca15e5120518852584fa17aa94012af8f1a
Merged-In: I3660e2f3913a73904181449c2d910af0a0477950
2017-03-07 11:39:24 -08:00
Filip Pavlis
e88fbbac12 Merge "Fix home/back buttons flow in PreferenceActivity." 2017-03-07 19:09:50 +00:00
Filip Pavlis
6af15ebcfe Fix home/back buttons flow in PreferenceActivity.
Bug: b/35977048
Test: Done manually. Automated test will be added later.

After recent changes in PreferenceActivity finishing the activity on
pressing back is not correct anymore. Instead onBackButton method should
be called to deal with it (we have fragments transactions for instance).

There can be multiple buttons:
1. The native default one - calls onBackPressed by default so no extra work
needed.
2. PreferenceActivity has buttons that can de displayed when settting
EXTRA_PREFS_SHOW_BUTTON_BAR to true. But it is a private API and I
didn't find any usage of it, so there is no need to change that. Also
it looks like something very specific used in WiFi wizards.
3. Apps often use a toolbar that has a home button which essentialy
emulates back button. The issue is that this Activity never had support
for this. So apps had to override onOptionsItemSelected and some of
those are unfortunately calling finish() which worked previously when
PreferenceActivity wasn't using fragments in single pane. This CL adds
support so app will no longer need to override that method and some
apps need to be instructed to use that override in O.

Change-Id: I94f557edb2e03f89fbf02e800beb390b2ad0544f
2017-03-07 19:05:57 +00:00
Doris Liu
21ba77f6b6 Ensure behavior consistency for 0 duration scale
BUG: 35590176
Test: cts in the same topic branch
Change-Id: Ia0a2518a1376d3f82ee6c5a7b27e3cb24ed54cbf
2017-03-07 10:59:47 -08:00
Calin Juravle
9108ae1a16 Merge "PackageManager: Clean up code related to foreign dex use" 2017-03-07 18:48:17 +00:00
Pavel Grafov
9cdba2722f Retry SECURITY_LOGS_AVAILABLE if DO doesn't request the logs
Test: manually, with TestDPC.
Bug: 34186771
Change-Id: I99ec406b05f7b072c2c729f6336d1a5cf0f7c3d4
2017-03-07 18:43:36 +00:00
Scott Main
798dcd93fd Merge "Mark @ symbols in code snippet as literal so javadoc doesn't choke on them. Which for some reason only starts to happen when we start processing the annotation methods in this CL: https://googleplex-android-review.git.corp.google.com/#/c/1892771/" 2017-03-07 18:25:38 +00:00
TreeHugger Robot
a61627935e Merge "Support non-system Font Providers" 2017-03-07 18:17:15 +00:00
Jeremy Joslin
9925c6a7e7 Keep Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED updated.
Make sure Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED reflects
the current active scorer state. When valid the setting will have a
value of 1, when invalid it will be 0 (or more
accurately not 1, see below).

Introduced a new valid setting value, -1, which indicates the feature
has been forced off.

Test: runtest frameworks-services -c com.android.server.NetworkScorerAppManagerTest
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 35896421
Change-Id: I271725f798e5d0acc7c08c79678dba5115f8faad
2017-03-07 10:13:41 -08:00
Eino-Ville Talvala
49c62f51ba Camera: Add createCustomCameraSession to system API.
This has been requested by various Android implementers as
a way to simplify building new device-specific features for
default camera applications.

Test: The added system API tests pass.
Bug: 34853980
Change-Id: I3190f59394af97c0b0c8e520696d096235d596b9
2017-03-07 10:04:01 -08:00
Eino-Ville Talvala
0e04e910a6 CameraDevice: Add hidden createCustomCaptureSession
This exposes a direct route to selecting the operating mode, instead
of only allowing normal and high-speed modes.

Test: Compiles
Bug: 34853980
Change-Id: Ib4f833399834c9bacb9de666560e909109aa5af9
2017-03-07 10:04:01 -08:00
Chris Wren
0697f96491 Merge "add clear methods to LogMaker" 2017-03-07 17:54:53 +00:00
Chris Wren
877f51ae88 Merge "remove the last of the legacy log helpers" 2017-03-07 17:50:15 +00:00
Andreas Gampe
19f1844e7e Merge "Framework: Ensure image heap string literals for Patterns" am: d0f092af84 am: 838851364b
am: 5fe3eb7696

Change-Id: Ia0bf25c740eedee436436e573241a59685db2fbd
2017-03-07 17:08:43 +00:00
Etan Cohen
a123f73a1c Merge "[CM] Allow timeout in request network" am: 8328f27a87 am: 645b48c8af
am: ac879cbcaf

Change-Id: If42250966d619073d45d608aab454589213b1756
2017-03-07 17:02:05 +00:00
Andreas Gampe
838851364b Merge "Framework: Ensure image heap string literals for Patterns"
am: d0f092af84

Change-Id: I69886924b3aca6c050239069c00e166142e2e522
2017-03-07 16:59:12 +00:00
Treehugger Robot
d0f092af84 Merge "Framework: Ensure image heap string literals for Patterns" 2017-03-07 16:50:59 +00:00
Etan Cohen
645b48c8af Merge "[CM] Allow timeout in request network"
am: 8328f27a87

Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0
2017-03-07 16:49:53 +00:00
Etan Cohen
8328f27a87 Merge "[CM] Allow timeout in request network" 2017-03-07 16:40:27 +00:00
TreeHugger Robot
c7eefdbda7 Merge "Framework: Avoid string allocations" 2017-03-07 16:02:54 +00:00
Chris Wren
f33926abed remove the last of the legacy log helpers
All logs should now flow through LogMaker.

Bug: 34705522
Test: mmma -j20 platform_testing/tests/functional/notificationtests && adb install -r -g /data/app/NotificationFunctionalTests/NotificationFunctionalTests.apk && adb shell am instrument -w -e iterations 1 -e class com.android.notification.functional.NotificationInteractionTests com.android.notification.functional/android.support.test.runner.AndroidJUnitRunner && runtest --path platform_testing/libraries/metrics-helper/tests
Change-Id: I94732c84564e4cb25d77b63be8beb4aab4c38985
2017-03-07 10:49:07 -05:00
Chris Wren
a7c1b80f5f add clear methods to LogMaker
To support object reuse.

Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Bug: 36020746
Change-Id: I09e5689da70963e9aba3bd8428a55acfcbe4e92a
2017-03-07 10:41:39 -05:00
Clara Bayarri
3c4be77db9 Support non-system Font Providers
To do this, the developer must specify the set of certificate
hashes that represent the authority's app. This allows us to
verify that the authority we find is indeed the one intended
by the developer.

Bug: 35025705
Test: runtest --path frameworks/base/core/tests/coretests/src/android/provider/FontsContractTest.java
runtest --path frameworks/base/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java
CTS attached to topic
Change-Id: I605f9a93bbca8705936ead08efb4a5b4fdcc4882
2017-03-07 14:59:33 +00:00
Erik Kline
a33ae2d884 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 75dfc5bd91 am: 0f901af920
am: bb54baba04

Change-Id: Id2aa8aeff6d299edb85955c12ab0a04023458597
2017-03-07 13:42:11 +00:00
Erik Kline
0f901af920 Merge "request{LinkProperties,NetworkCapabilities} no longer needed"
am: 75dfc5bd91

Change-Id: I79b9323be242ed5d2bf83962f78c613a465a20b8
2017-03-07 13:33:29 +00:00
Abodunrinwa Toki
0f502cb1b6 Merge "Prevent crashes when in insertion mode." 2017-03-07 12:54:52 +00:00
Erik Kline
465c46d555 request{LinkProperties,NetworkCapabilities} no longer needed
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toggling between WiFi and mobile
Bug: 32163131
Change-Id: I57edf5114b6361f320577c7870e40f8b3cdf74ce
2017-03-07 17:18:06 +09:00
Erik Kline
6bbefcbf40 Merge "Always send all available state when calling onAvailable()." am: affbb8b6a9 am: e0a62a4398
am: 3765538bab

Change-Id: Ic82e3cb92841ea99972faad6ae004d77c725831b
2017-03-07 06:08:40 +00:00
Erik Kline
e0a62a4398 Merge "Always send all available state when calling onAvailable()."
am: affbb8b6a9

Change-Id: I81e70fecf060a4103b51084a60a32c78f6219f6b
2017-03-07 06:00:09 +00:00
TreeHugger Robot
7cae77b606 Merge changes Iefcaf262,I9c397d83
* changes:
  Fixed a bug where the expand icon could show but nothing happens
  Improved expand accessibility experience
2017-03-07 05:44:54 +00:00
Winson Chung
192b50d518 Merge "Small fixes and tweaks to PiP transition." 2017-03-07 05:02:17 +00:00