Yifan Hong
d197656a48
Merge "Merge "android.os.VintfObject: add API for EDI." into oc-dev am: 718688f39b" into oc-dev-plus-aosp
...
am: d73937d3cc
2017-05-05 22:34:47 +00:00
George Mount
eed3d770d2
Merge "Remove duplicated onBackStackChanged() call." into oc-dev am: c110c5edf4
...
am: 277e42ffdb
2017-05-05 22:29:01 +00:00
Yifan Hong
6d62f812e9
Merge "android.os.VintfObject: add API for EDI." into oc-dev
...
am: 718688f39b
2017-05-05 22:05:08 +00:00
George Mount
dcc3c14e6b
Merge "Remove duplicated onBackStackChanged() call." into oc-dev
...
am: c110c5edf4
2017-05-05 22:02:37 +00:00
George Mount
277e42ffdb
Merge "Remove duplicated onBackStackChanged() call." into oc-dev
...
am: c110c5edf4
2017-05-05 21:53:54 +00:00
TreeHugger Robot
718688f39b
Merge "android.os.VintfObject: add API for EDI." into oc-dev
2017-05-05 21:47:47 +00:00
Kenny Root
47fe478523
Track updates to Conscrypt am: 7fdce769c3 am: 0634c4f77f am: 4fd0b06ac7
...
am: 7df412a6bf
2017-05-05 21:46:33 +00:00
TreeHugger Robot
c110c5edf4
Merge "Remove duplicated onBackStackChanged() call." into oc-dev
2017-05-05 21:43:04 +00:00
Kenny Root
7df412a6bf
Track updates to Conscrypt am: 7fdce769c3 am: 0634c4f77f
...
am: 4fd0b06ac7
2017-05-05 21:32:28 +00:00
Kenny Root
4fd0b06ac7
Track updates to Conscrypt am: 7fdce769c3
...
am: 0634c4f77f
2017-05-05 21:18:09 +00:00
Kenny Root
0634c4f77f
Track updates to Conscrypt
...
am: 7fdce769c3
2017-05-05 21:08:48 +00:00
Abodunrinwa Toki
fc9b396c10
Merge "Reject smart selection if outside original selection." into oc-dev am: 6dcae2b91f
...
am: 4aeea2404c
2017-05-05 20:41:59 +00:00
Abodunrinwa Toki
4aeea2404c
Merge "Reject smart selection if outside original selection." into oc-dev
...
am: 6dcae2b91f
2017-05-05 20:35:04 +00:00
TreeHugger Robot
6dcae2b91f
Merge "Reject smart selection if outside original selection." into oc-dev
2017-05-05 20:29:33 +00:00
Makoto Onuki
ebe175c92f
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev am: 9ccb15a351
...
am: f14f38ba4a
2017-05-05 20:24:45 +00:00
Makoto Onuki
f14f38ba4a
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
...
am: 9ccb15a351
2017-05-05 20:16:49 +00:00
Makoto Onuki
9ccb15a351
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
2017-05-05 20:11:08 +00:00
Todd Kennedy
e12063c15f
Merge "Create auxiliary info for local instant apps" into oc-dev am: 4804e41574
...
am: 143ad7ff09
2017-05-05 20:02:48 +00:00
Todd Kennedy
143ad7ff09
Merge "Create auxiliary info for local instant apps" into oc-dev
...
am: 4804e41574
2017-05-05 19:56:16 +00:00
TreeHugger Robot
4804e41574
Merge "Create auxiliary info for local instant apps" into oc-dev
2017-05-05 19:35:32 +00:00
Seigo Nonaka
c7b291aad6
Merge "Resolve styles by font table if not specified." into oc-dev am: 1ea3a2600b
...
am: c000acd771
2017-05-05 19:15:24 +00:00
Seigo Nonaka
c000acd771
Merge "Resolve styles by font table if not specified." into oc-dev
...
am: 1ea3a2600b
2017-05-05 19:05:18 +00:00
Ajay Panicker
3198ccf4e4
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev am: 73971b2a43
...
am: 8ddad99cd1
2017-05-05 19:00:50 +00:00
Ajay Panicker
8ddad99cd1
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev
...
am: 73971b2a43
2017-05-05 18:55:41 +00:00
TreeHugger Robot
1ea3a2600b
Merge "Resolve styles by font table if not specified." into oc-dev
2017-05-05 18:51:25 +00:00
Ajay Panicker
73971b2a43
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev
2017-05-05 18:45:17 +00:00
Abodunrinwa Toki
db8e72c5a8
Merge "TextClassifier: Remove debug logs." into oc-dev am: dc4fc1ebc2
...
am: 79c87bdf20
2017-05-05 18:01:37 +00:00
Abodunrinwa Toki
79c87bdf20
Merge "TextClassifier: Remove debug logs." into oc-dev
...
am: dc4fc1ebc2
2017-05-05 17:55:41 +00:00
TreeHugger Robot
dc4fc1ebc2
Merge "TextClassifier: Remove debug logs." into oc-dev
2017-05-05 17:49:43 +00:00
Todd Kennedy
c0dd03a666
Create auxiliary info for local instant apps
...
This reverts commit a1d8051fa2https://www.nytimes.com/crosswords/game/mini ]
Test: Try to run installed instant app from gMail
2017-05-05 10:34:28 -07:00
Abodunrinwa Toki
b416297433
Reject smart selection if outside original selection.
...
- The aim is to be defensive and prefer to reject a selection if
it is likely to be wrong.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 38019270
Change-Id: I35ebc84fb102373949366296434a31d899edfef3
2017-05-05 18:07:17 +01:00
Seigo Nonaka
a5fa9e8a63
Resolve styles by font table if not specified.
...
android:fontStyle and android:fontWeight is an optional attribute.
If they are missing, we are using non-italic 400 weight, but this is
not good idea. We should resolve these style value from font metadata.
Bug: 37988154
Test: am instrument -w -e class android.content.res.cts.ResourcesTest
android.content.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I80a436cd3632d8c58fa3d8bdaedac73b95f61a8c
2017-05-05 09:30:34 -07:00
Bryce Lee
d36d46dd27
Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev am: 8cfb1a95da
...
am: fb19563972
2017-05-05 16:10:51 +00:00
Neil Fuller
056156f616
Add (disabled) time zone update system server impl
...
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.
The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.
The updater is then required to communicate with the
data app and report back to the system server.
Unit tests are included for the major components.
To run:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
This contains a cherry-pick / conflict resolution of
commit 68f666693a68f666693a
2017-05-05 17:09:58 +01:00
Bryce Lee
fb19563972
Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev
...
am: 8cfb1a95da
2017-05-05 15:54:41 +00:00
Todd Kennedy
d86841e7cd
Merge "Don't set the failure extra on split install" into oc-dev am: d14e67656f
...
am: 9968f9aa27
2017-05-05 15:53:18 +00:00
Todd Kennedy
7a6eafb7a9
Merge "Create auxiliary info for local instant apps" into oc-dev am: d55670bcf5
...
am: b21b3efc55
2017-05-05 15:52:01 +00:00
Bryce Lee
8cfb1a95da
Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev
2017-05-05 15:46:37 +00:00
Bryce Lee
a1d8051fa2
Revert "Create auxiliary info for local instant apps"
...
This reverts commit e15e7cb592
2017-05-05 15:38:44 +00:00
Tomasz Wasilczyk
8a3e865cf0
Merge "Dummy implementation get/setMute calls of ITuner."
2017-05-05 14:35:21 +00:00
Todd Kennedy
9968f9aa27
Merge "Don't set the failure extra on split install" into oc-dev
...
am: d14e67656f
2017-05-05 14:30:09 +00:00
Todd Kennedy
b21b3efc55
Merge "Create auxiliary info for local instant apps" into oc-dev
...
am: d55670bcf5
2017-05-05 14:27:55 +00:00
Neil Fuller
5175e734a1
Merge "Add (disabled) time zone update system server impl" am: cba224e833
...
am: 0a6aeccab2
2017-05-05 14:23:04 +00:00
TreeHugger Robot
d14e67656f
Merge "Don't set the failure extra on split install" into oc-dev
2017-05-05 14:21:18 +00:00
TreeHugger Robot
d55670bcf5
Merge "Create auxiliary info for local instant apps" into oc-dev
2017-05-05 14:20:51 +00:00
TreeHugger Robot
953dca4c27
Merge "Add (disabled) time zone update system server impl"
2017-05-05 12:21:34 +00:00
Vladislav Kuzkokov
0883dd5e14
Merge "Store "block uninstall" flag separately from the rest of package state." into oc-dev
...
am: 914d4bf10f
2017-05-05 09:40:34 +00:00
Vladislav Kuzkokov
914d4bf10f
Merge "Store "block uninstall" flag separately from the rest of package state." into oc-dev
2017-05-05 09:36:51 +00:00
Dianne Hackborn
1391e2348b
Merge "All kinds of little foreground services fixes." into oc-dev am: 525044e987
...
am: 596fc8b8d4
2017-05-05 09:13:24 +00:00
Dianne Hackborn
596fc8b8d4
Merge "All kinds of little foreground services fixes." into oc-dev
...
am: 525044e987
2017-05-05 09:06:34 +00:00
