Commit Graph

67837 Commits

Author SHA1 Message Date
TreeHugger Robot
9165948219 Merge "Retry SECURITY_LOGS_AVAILABLE if DO doesn't request the logs" 2017-03-07 20:21:29 +00: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
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
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
TreeHugger Robot
8cfea13985 Merge "Move requestKeyboardShortcuts intent to com.android" 2017-03-07 03:59:47 +00:00
Erik Kline
c75d4fad22 Always send all available state when calling onAvailable().
The state that needs to be transferred includes:
    - NetworkCapabilities
    - LinkProperties
    - whether the network is currently suspended

Additionally:
    - Rename notifyNetworkCallback() to notifyNetworkAvailable()
      in order to clarify its real function.
    - fix previous copy/paste error in unittest

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - USB tethering with mobile and Wi-Fi upstream toggling
Bug: 32163131
Change-Id: Ib4460bcd5d08863a9feac9e8ab41a238897bb3ea
2017-03-07 12:57:26 +09:00
Ruchi Kandoi
c2cf8e0b0c Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" am: 7b0d16249c am: 9377a53aa9
am: 61d2a43fa9

Change-Id: Ibb35611f958bf9d1525e0b491860cbc87f1e1273
2017-03-07 02:59:38 +00:00
Ruchi Kandoi
9377a53aa9 Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field"
am: 7b0d16249c

Change-Id: I35ccc367fc1182c1cf8c470d8bfcf6dcf27d2825
2017-03-07 02:46:54 +00:00
Calin Juravle
74f0a3450c 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
Change-Id: I3660e2f3913a73904181449c2d910af0a0477950
2017-03-06 17:59:12 -08:00
TreeHugger Robot
7f792f4be1 Merge "Customizable minimum suffix/prefix length for hyphenation" 2017-03-07 01:46:03 +00:00
Andreas Gampe
e9a5262f2a Framework: Avoid string allocations
Avoid common string allocations for ":complete".

Test: m
Test: Device boots
Change-Id: I8c7a53346a4e1aa1beefd17429e13e20ab510f20
2017-03-06 17:27:09 -08:00
Saige McVea
902adc6cde Merge "Accessibility settings refresh." 2017-03-07 01:16:50 +00:00
Winson Chung
baa7b721dc Small fixes and tweaks to PiP transition.
- Fixing case where default bounds did not account for ime height
- Ensuring that we using the animating/target bounds when calculating
  the new ime-offset bounds
- Tweaking transition interpolators and durations

Bug: 35396882
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ia22ea0008d834c47a3f26bf2e1f484c72fae8736
2017-03-06 16:39:40 -08:00
Scott Main
fc4373c7f6 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/

Change-Id: Ie933cc25b01d07cd04074aff6ca41e21803f73c5
2017-03-07 00:33:20 +00:00
Abodunrinwa Toki
792d820cc9 Prevent crashes when in insertion mode.
Test: Manually tested. Automated core tests will be written in another
CL.

Change-Id: If07fa6a81e60de43d8be2cbcf37b355403779fb8
2017-03-06 23:51:11 +00:00
TreeHugger Robot
ca006f9d3d Merge "Rename DPM.isDefaultInputMethodSetByOwner()" 2017-03-06 23:41:44 +00:00
Saige McVea
08c41bcf5f Accessibility settings refresh.
Categories were added to accessibility service info objects so that they can be grouped
in system Settings. Services can declare a category in their accessibility manifest file,
and if no category is defined, the service is placed under the "Other services" category.

Bug: 30374533

Test: Manually tested with BrailleBack & CTS tests modified to validate proper loading of summary.

Change-Id: I8718556764f2be4a18ce4e80e6bbd4950a41e387
2017-03-06 15:04:00 -08:00
Santos Cordon
25e333cb3c Merge "Add VR_DISPLAY_MODE settings to be backed up." 2017-03-06 21:56:07 +00:00
Roozbeh Pournader
a59c3feb8d Customizable minimum suffix/prefix length for hyphenation
With this change, different languages can have a different minimum
length for suffix and prefixes when hyphenating. Previously, the
defaults used for English, 2 and 3, were used for every language.

Bug: 35712376
Test: Manual: German text can now break after two characters
Change-Id: Ia12d448a42bf2fab7c0bf5e85f8e27a4fb7f77d8
2017-03-06 13:51:28 -08:00
TreeHugger Robot
a485f71fd7 Merge "Refactor EphemeralResolverService" 2017-03-06 21:39:17 +00:00
Ruchi Kandoi
2b527ac293 nfc: First chunked NDEF record of TNF doesn't contain the type field
Test: CTS test passes
Bug: 34943312
Change-Id: I08f37ee76810f642b35ae8bde05ef0e2eff921e0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-03-06 13:10:20 -08:00
TreeHugger Robot
3a47175778 Merge "Fix Loader bugs" 2017-03-06 19:31:30 +00:00
Roozbeh Pournader
b85f02e9ad Merge "Frameworks support for hyphenation for various complex cases" 2017-03-06 19:19:11 +00:00
TreeHugger Robot
d4bd7f1ee6 Merge "Removing check for launched-from package to expand PiP." 2017-03-06 18:46:07 +00:00
Makoto Onuki
845dcf0471 Merge "Mention the relaxed security check on UM.isUserRunningOrStopping()." 2017-03-06 17:22:55 +00:00
Clara Bayarri
847d8683a0 Move requestKeyboardShortcuts intent to com.android
Test: none
Bug: 35307747
Change-Id: Ibaf260ebe75bc80d48167209af7d034c582160b7
2017-03-06 16:48:44 +00:00
Filip Pavlis
ac24f094f6 Merge "Improve preferences for PreferenceDataStore." 2017-03-06 13:29:32 +00:00