OSDN Git Service
Matthew Ng [Thu, 5 Oct 2017 00:51:33 +0000 (00:51 +0000)]
Merge "Hides the statusbar in recents for low ram devices" into oc-mr1-dev
am:
eb7aba16d2
Change-Id: I73c29391eebb8df44c9ae40c00a594e4a0cd5580
Guliz Tuncay [Thu, 5 Oct 2017 00:34:52 +0000 (00:34 +0000)]
Merge "Update Settings properly when no Spell Checker is available." into oc-mr1-dev
am:
406d5dfb12
Change-Id: Ie4eb7ae96307ac8e746f2b24b3e7a926526e1be5
TreeHugger Robot [Thu, 5 Oct 2017 00:34:02 +0000 (00:34 +0000)]
Merge "Hides the statusbar in recents for low ram devices" into oc-mr1-dev
Calin Juravle [Thu, 5 Oct 2017 00:25:11 +0000 (00:25 +0000)]
Merge "[framework] Compile secondary dex files in isolation" into oc-mr1-dev
am:
446e8babd6
Change-Id: I341efd5d36021b29a84fed72a715c6babb324e68
TreeHugger Robot [Thu, 5 Oct 2017 00:08:53 +0000 (00:08 +0000)]
Merge "Update Settings properly when no Spell Checker is available." into oc-mr1-dev
Adam Lesinski [Thu, 5 Oct 2017 00:08:33 +0000 (00:08 +0000)]
Merge "Finalize resource IDs for O-MR1" into oc-mr1-dev
am:
eb74a38bb8
Change-Id: I38e5a43144de5d5a49de29ab5ec4f9b8cfa103f0
Calin Juravle [Wed, 4 Oct 2017 23:59:10 +0000 (23:59 +0000)]
Merge "[framework] Compile secondary dex files in isolation" into oc-mr1-dev
Robert Carr [Wed, 4 Oct 2017 23:50:24 +0000 (23:50 +0000)]
Merge "Disable seamless-rotation when other windows are visible." into oc-mr1-dev
am:
59c258d83b
Change-Id: I663dd7a4dda53af850604c657dd54368310798ba
TreeHugger Robot [Wed, 4 Oct 2017 23:48:04 +0000 (23:48 +0000)]
Merge "Finalize resource IDs for O-MR1" into oc-mr1-dev
TreeHugger Robot [Wed, 4 Oct 2017 23:35:51 +0000 (23:35 +0000)]
Merge "Disable seamless-rotation when other windows are visible." into oc-mr1-dev
Felipe Leme [Wed, 4 Oct 2017 22:25:18 +0000 (22:25 +0000)]
Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev
am:
6d17d9d0cf
Change-Id: I4b1d2a4e308a91d15282ae99ee158b7004b91211
TreeHugger Robot [Wed, 4 Oct 2017 22:17:11 +0000 (22:17 +0000)]
Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev
Matthew Ng [Wed, 4 Oct 2017 21:18:30 +0000 (14:18 -0700)]
Hides the statusbar in recents for low ram devices
When entering recents on a low ram device, the system will hide the
statusbar to match the spec (go/android-go-recents).
Test: manual - enter recents
Bug:
67346921
Change-Id: I180899560aa1379b0a68cf63ae9b780fdef1746d
Brad Ebinger [Wed, 4 Oct 2017 22:04:27 +0000 (22:04 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev
am:
dbe2815199 -s ours
Change-Id: I0d1a9f811d3a35dacbc7c8527948da7ab5bde6c2
Brad Ebinger [Wed, 4 Oct 2017 21:54:12 +0000 (21:54 +0000)]
Adds a filtering bitmask to DownloadStateCallback
am:
dec9fda324 -s ours
Change-Id: I44e41907f229447dc53eb6fd19c7c6c8fd5bc95e
Brad Ebinger [Wed, 4 Oct 2017 21:42:33 +0000 (21:42 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev
Robert Carr [Mon, 2 Oct 2017 20:00:55 +0000 (13:00 -0700)]
Disable seamless-rotation when other windows are visible.
Was never supported but has gotten more horrific for whatever reason.
Bug:
65612427
Change-Id: I25758f40876c76a6daaf6330ed7cfa84c759fc0f
Adam Lesinski [Wed, 4 Oct 2017 21:02:24 +0000 (14:02 -0700)]
Finalize resource IDs for O-MR1
Bug:
65543844
Test: manual
Merged-In: Ic1fd1278373a5f7486e214d3f7f4c13515edb9f9
Change-Id: Ic1fd1278373a5f7486e214d3f7f4c13515edb9f9
Calin Juravle [Wed, 4 Oct 2017 17:53:09 +0000 (10:53 -0700)]
[framework] Compile secondary dex files in isolation
The class loader context adds the overhead of extracting in-memory and
possibly extra verification which is being frowned upon when the loading
happens on the UI thread. Revert the correct fix of compiling secondary
dex files with their loading context until b/
64530081 is done.
Partial revert of commit
f1ff36f0f99ebb41d0c7e0f3248506a56998fa3f.
Test: adb shell cmd package compile -m quicken -f --secondary-dex
com.google.android.gms
Bug:
64530081
Bug:
66984396
Change-Id: Ib2815ce67b224883fe95c28d1424103e56342c6e
nharold [Wed, 4 Oct 2017 20:53:04 +0000 (20:53 +0000)]
Merge changes from topic "ipsec-svc-cleanup" am:
9778c7884f am:
ae61e0c6e8
am:
4e793fd0b5
Change-Id: Ib7eae5c9e223493281524e862979e16d25984dde
nharold [Wed, 4 Oct 2017 20:35:20 +0000 (20:35 +0000)]
Merge changes from topic "ipsec-svc-cleanup" am:
9778c7884f
am:
ae61e0c6e8
Change-Id: If8803e2fc98adb2f08a5bf2944fc60d0f0e71acd
Felipe Leme [Wed, 4 Oct 2017 20:25:42 +0000 (20:25 +0000)]
Merge "Improved javadocs for Autofill save workflow." into oc-mr1-dev
am:
94e07022c2
Change-Id: Iccafb0ef26a19788e6bd1d46fb856eb66d8e6087
nharold [Wed, 4 Oct 2017 20:24:10 +0000 (20:24 +0000)]
Merge changes from topic "ipsec-svc-cleanup"
am:
9778c7884f
Change-Id: Ide81ae76bd05ba3a2cc7c06c072306d30a489057
Brad Ebinger [Wed, 4 Oct 2017 20:12:36 +0000 (20:12 +0000)]
Merge "Remove verification for DownloadReceiver when failure" into oc-mr1-dev
am:
bd8d517381 -s ours
Change-Id: I11bbe95905e1324933ff4d439e4b2539a60e764f
TreeHugger Robot [Wed, 4 Oct 2017 20:02:19 +0000 (20:02 +0000)]
Merge "Improved javadocs for Autofill save workflow." into oc-mr1-dev
nharold [Wed, 4 Oct 2017 20:00:52 +0000 (20:00 +0000)]
Merge changes from topic "ipsec-svc-cleanup"
* changes:
Split IpSecServiceTest to add IPv6 Tests
Add equals() for IpSecAlgorithm and IpSecConfig
Input Validation for IpSecService
Brad Ebinger [Wed, 4 Oct 2017 19:55:34 +0000 (19:55 +0000)]
Merge "Remove verification for DownloadReceiver when failure" into oc-mr1-dev
Yohei Yukawa [Wed, 4 Oct 2017 19:54:58 +0000 (19:54 +0000)]
Merge "Select only preinstalled Spell Checker Services" into oc-mr1-dev
am:
f93ca9fb89
Change-Id: I22482b8cda7a4ef2aad231f8ee4482b4a9aded9d
Yohei Yukawa [Wed, 4 Oct 2017 19:39:53 +0000 (19:39 +0000)]
Merge "Select only preinstalled Spell Checker Services" into oc-mr1-dev
Felipe Leme [Wed, 4 Oct 2017 16:56:21 +0000 (09:56 -0700)]
Sets AutofillClient on attachBaseContext()
When an activity overrides attachBaseContext(), the attached context must share
the same AutofillCient, otherwise it will break autofill in the activity.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.AttachedContextActivityTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Fixes:
67350639
Change-Id: I6b0c4c2fab5fa68eb6ee0714e107ca0816efb2cb
Brad Ebinger [Wed, 4 Oct 2017 18:58:09 +0000 (18:58 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale" into oc-mr1-dev
am:
ea2c75f5ff -s ours
Change-Id: I07337343468beab7c24d78624d1e84d2534c3ecd
Jean-Michel Trivi [Wed, 4 Oct 2017 18:48:00 +0000 (18:48 +0000)]
Merge "AudioService: log ducking and incall muting of audio players" into oc-mr1-dev
am:
df3e2be715
Change-Id: I48361e2466fdaa723ec6f90ef6e3efd2d3761583
Brad Ebinger [Wed, 4 Oct 2017 18:35:12 +0000 (18:35 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale" into oc-mr1-dev
Jean-Michel Trivi [Wed, 4 Oct 2017 18:33:42 +0000 (18:33 +0000)]
Merge "AudioService: log ducking and incall muting of audio players" into oc-mr1-dev
Jack He [Wed, 4 Oct 2017 18:09:50 +0000 (18:09 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am:
cfe51aabd2 am:
8057ba832e
am:
5dfce858ea
Change-Id: Ia3112971eb20c04325dd04bc76078195cec99a5f
Jack He [Wed, 4 Oct 2017 17:42:26 +0000 (17:42 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am:
cfe51aabd2
am:
8057ba832e
Change-Id: I946cce466bb5e048ad7b19cd97caa466dab27a52
Brad Ebinger [Fri, 29 Sep 2017 22:12:08 +0000 (15:12 -0700)]
Adds a filtering bitmask to DownloadStateCallback
Adds the ability for an EMBMS app to specify a filtering
bitmask to DownloadStateCallback, which is used to filter
out callbacks that the EMBMS app doesn't need to listen
to.
Test: Testapps
Bug:
67112896
Merged-In: Iab96a457f45f759267b9a5a41df533c9988ede94
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb
Jack He [Wed, 4 Oct 2017 17:22:28 +0000 (17:22 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
am:
cfe51aabd2
Change-Id: I6e2337a0b0f4722b82a91c53c340618b9277f3f6
Treehugger Robot [Wed, 4 Oct 2017 17:01:00 +0000 (17:01 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
Guliz Tuncay [Thu, 17 Aug 2017 22:25:38 +0000 (15:25 -0700)]
Update Settings properly when no Spell Checker is available.
Currently, Settings is not being updated properly when the current spell
checker service is removed or disabled and there is no other spell
checker service available. The correct behavior is that Secure.Settings
should be updated with empty string to indicate there is no selected
spell checker service.
Bug:
64812014
Fixes:
67412078
Test: Manually as follows:
0. Make sure AOSP keyboard is installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
-> com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
7. adb uninstall com.example.android.samplespellcheckerservice
8. adb shell settings get --user 0 secure selected_spell_checker
-> empty
9. adb root
10. adb shell settings get --user 0 secure selected_spell_checker
-> empty
11. adb shell pm enable com.android.inputmethod.latin
12. adb shell settings get --user 0 secure selected_spell_checker
Change-Id: I30902a3d94f2ddef33f4a8067799e98322ae3a03
Merged-In: I30902a3d94f2ddef33f4a8067799e98322ae3a03
(manual cherrypick of
83a7330bbe8ee1e8fcaa88ba2fb5e4cb3154c790)
Jack He [Tue, 3 Oct 2017 02:08:30 +0000 (19:08 -0700)]
PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent
* Use ACTION_CONNECTION_STATE_CHANGED to broadcast connection state
change to comply with BluetoothProfile interface requirement
* Use BluetoothProfile.STATE_* variables to represent connection
states for PBAP profile
Bug:
63873163
Test: Connect to car kits
Change-Id: I7dfcfc1b3a3e4868ea5e313f62ad5e504d58b9c2
Guliz Tuncay [Wed, 16 Aug 2017 19:02:31 +0000 (12:02 -0700)]
Select only preinstalled Spell Checker Services
When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.
Bug:
64764051
Fixes:
67410643
Test: Manually as follows:
0. Make sure AOSP keyboard is pre-installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
-> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
7. adb reboot
8. adb shell settings get --user 0 secure selected_spell_checker
-> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
Change-Id: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
Merged-In: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
(manual cherrypick of
0f0a37ba7def8db2c3e0ff1d7d8a30360e889f3f)
Eric Laurent [Wed, 4 Oct 2017 14:56:26 +0000 (14:56 +0000)]
Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev
am:
77ee4f2ff2
Change-Id: Ib39341f455b82750ef357dbf41d8815fb303844d
Eric Laurent [Wed, 4 Oct 2017 14:45:01 +0000 (14:45 +0000)]
Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev
Ben Schwartz [Wed, 4 Oct 2017 13:18:58 +0000 (13:18 +0000)]
Merge "New function signature for setResolverConfiguration" am:
8052930f4f am:
12318b5b4e
am:
2cc6819ebf
Change-Id: I10c492c5512b79b6a127d9dd3cae8ccf380001fb
Ben Schwartz [Wed, 4 Oct 2017 13:04:43 +0000 (13:04 +0000)]
Merge "New function signature for setResolverConfiguration" am:
8052930f4f
am:
12318b5b4e
Change-Id: I12d721a809646070900f81723a4d10f4635fec15
Ben Schwartz [Wed, 4 Oct 2017 12:54:14 +0000 (12:54 +0000)]
Merge "New function signature for setResolverConfiguration"
am:
8052930f4f
Change-Id: I1a2efbabc765dd1ff66316332cd69b221deff83b
Clara Bayarri [Wed, 4 Oct 2017 12:51:59 +0000 (12:51 +0000)]
Merge "Fix NPE in ActivityThread" into oc-mr1-dev
am:
348b13f597
Change-Id: I4ac05199b93902bb19fd6eb42563e9c4fa00ed6c
TreeHugger Robot [Wed, 4 Oct 2017 12:40:39 +0000 (12:40 +0000)]
Merge "Fix NPE in ActivityThread" into oc-mr1-dev
Treehugger Robot [Wed, 4 Oct 2017 12:39:09 +0000 (12:39 +0000)]
Merge "New function signature for setResolverConfiguration"
Sudheer Shanka [Wed, 4 Oct 2017 07:03:28 +0000 (07:03 +0000)]
Merge "Update NPMS to inform NMS of the changes in fw rules synchronously." into oc-mr1-dev
am:
7a349d7288
Change-Id: Ie01c1ba49bd72a4690d2f29689bc94f9fd793cb8
Chih-hung Hsieh [Wed, 4 Oct 2017 06:56:55 +0000 (06:56 +0000)]
Merge "Revert work around clang-tidy segmentation fault." am:
a47e513464 am:
e640a8284d
am:
5105505efd
Change-Id: I9c8bbe4322542d02dc43253b23ff7b0932488142
Chih-hung Hsieh [Wed, 4 Oct 2017 06:47:41 +0000 (06:47 +0000)]
Merge "Revert work around clang-tidy segmentation fault." am:
a47e513464
am:
e640a8284d
Change-Id: Ia52f1419e49016748e5651b192ef2eba19008d8d
Sudheer Shanka [Wed, 4 Oct 2017 06:47:13 +0000 (06:47 +0000)]
Merge "Update NPMS to inform NMS of the changes in fw rules synchronously." into oc-mr1-dev
Chih-hung Hsieh [Wed, 4 Oct 2017 06:38:31 +0000 (06:38 +0000)]
Merge "Revert work around clang-tidy segmentation fault."
am:
a47e513464
Change-Id: Ie04d0d16a05c35a865776571f95078e63bc1bf47
Chih-hung Hsieh [Wed, 4 Oct 2017 06:26:42 +0000 (06:26 +0000)]
Merge "Revert work around clang-tidy segmentation fault."
Steven Moreland [Wed, 4 Oct 2017 04:29:26 +0000 (04:29 +0000)]
Merge "Convert java hwbinder mk -> bp." am:
53c945fb71 am:
7bebf15460
am:
e215488334
Change-Id: Ic24c9d2af58e58aa97e0ad1f8b2ff50f7db66007
Steven Moreland [Wed, 4 Oct 2017 04:20:08 +0000 (04:20 +0000)]
Merge "Convert java hwbinder mk -> bp." am:
53c945fb71
am:
7bebf15460
Change-Id: Ia799ca49151cdb20b6327d814f65822b46d8fb45
Steven Moreland [Wed, 4 Oct 2017 04:11:38 +0000 (04:11 +0000)]
Merge "Convert java hwbinder mk -> bp."
am:
53c945fb71
Change-Id: Ia1bde2b32e824f160dd4e768531b6b48179f7ba5
Treehugger Robot [Wed, 4 Oct 2017 04:00:03 +0000 (04:00 +0000)]
Merge "Convert java hwbinder mk -> bp."
Steven Moreland [Mon, 2 Oct 2017 23:58:41 +0000 (16:58 -0700)]
Convert java hwbinder mk -> bp.
This library is used to avoid a circular dependency
between frameworks.jar and HIDL hal definition libs.
It is not installed on the device.
Bug:
33420795
Test: m -j hwbinder and things it depends on
Change-Id: I44cc670383f80275026ea892151524599b713087
Chih-Hung Hsieh [Wed, 4 Oct 2017 03:14:21 +0000 (20:14 -0700)]
Revert work around clang-tidy segmentation fault.
Bug:
34740546
Test: build with WITH_TIDY=1 and
WITH_TIDY_CHECKS="*,-readability-*,-google-readability-*,-google-runtime-references"
Change-Id: If99c75cab6a2bec0c6b38aa17189668b4943478d
Nathan Harold [Tue, 26 Sep 2017 18:44:23 +0000 (11:44 -0700)]
Split IpSecServiceTest to add IPv6 Tests
-Split IpSecServiceTest into parameterized
and single tests.
-Add IPv6 parameters
Bug:
66954381
Test: this
Change-Id: Ib98c112560014f73bccc3d2842c31d297c7a07ef
Nathan Harold [Tue, 26 Sep 2017 02:33:13 +0000 (19:33 -0700)]
Add equals() for IpSecAlgorithm and IpSecConfig
Add equality testing methods to support tests
for parceling and un-parceling IpSecConfig.
Bug:
38397094
Test: runtest -x IpSecConfigTest.java
Change-Id: I31e318334d39ed6e9daf5ec8f3be7dcec75e12ad
Nathan Harold [Wed, 23 Aug 2017 20:46:33 +0000 (13:46 -0700)]
Input Validation for IpSecService
All of the input to IpSecService over the Binder
interface needs to be validated both for sanity
and for safety.
-Sanity check all the parameters coming from binder.
-Added setters for IpSecConfig to decouple the test
from the IpSecManager. This was needed because the
input validation caused the tests to fail due to a
null parameter that was previously un-tested.
-Added the mode flag to the IpSecConfig bundle this
oversight was found during testing.
-Expose the getResourceId() methods for testing in
UdpEncapsulationSocket, SecurityParameterIndex, and
IpSecTransform classes.
-Remove the unneeded getIpSecConfig() from
IpSecTransform: unneeded now that we can synthesize
configs.
Bug:
38397094
Test: runtest frameworks-net
Change-Id: I5241fc7fbfa9816d54219acd8d81a9f7eef10dd4
Matthew Ng [Wed, 4 Oct 2017 01:07:47 +0000 (01:07 +0000)]
Merge "Fixes rounded corners for clear all button on low ram devices" into oc-mr1-dev
am:
440240db5c
Change-Id: I5bfd0a633e96447c37f7b64c4fc8fc52b374f059
TreeHugger Robot [Wed, 4 Oct 2017 00:57:04 +0000 (00:57 +0000)]
Merge "Fixes rounded corners for clear all button on low ram devices" into oc-mr1-dev
Felipe Leme [Wed, 4 Oct 2017 00:36:02 +0000 (00:36 +0000)]
Merge "Fixed URL used on sample." into oc-mr1-dev
am:
6ba7019bb0
Change-Id: I124cbaecd5f8763ecd7f4b06070af48f6b1e0c1d
TreeHugger Robot [Wed, 4 Oct 2017 00:21:37 +0000 (00:21 +0000)]
Merge "Fixed URL used on sample." into oc-mr1-dev
Sudheer Shanka [Tue, 3 Oct 2017 16:43:20 +0000 (09:43 -0700)]
Update NPMS to inform NMS of the changes in fw rules synchronously.
Currently, NPMS informs NMS synchronously at some events and
asynchronously at some others. If these sync and async calls get
interleaved, then NMS will end up in an inconsistent state.
In N-MR1, NPMS was updated to inform NMS asynchronously to avoid some
lock contentions during screen unlock. This shouldn't be a problem any more
since NPMS no longer updates its internal state on ui thread and also
netd calls have been optimized from ~50ms to ~7ms since then.
Bug:
66015813
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I24ccb5819430f19014630e7b90cba1f0b993e430
Matthew Ng [Tue, 3 Oct 2017 22:17:16 +0000 (15:17 -0700)]
Fixes rounded corners for clear all button on low ram devices
Fixed rounded corners for clear all button by using a themed
background color on a shape with rounded corners instead of
programmatically changing the background color.
Change-Id: Iaaf4f0d94d417b0064c7e6bf4895b49d9fa6561f
Fixes:
67368134
Test: manual - go to recents and scroll up to show clear all button
Android Build Merger (Role) [Tue, 3 Oct 2017 22:04:09 +0000 (22:04 +0000)]
Merge "Merge "AAPT2: Fix R.java styleable + indices ordering" into oc-mr1-dev am:
b986ebce75" into oc-mr1-dev-plus-aosp
Adam Lesinski [Tue, 3 Oct 2017 22:02:20 +0000 (22:02 +0000)]
Merge "AAPT2: Fix R.java styleable + indices ordering" into oc-mr1-dev
am:
b986ebce75
Change-Id: I16382162fecf323074c13b376a23fccab1da092b
Selim Cinek [Tue, 3 Oct 2017 21:59:03 +0000 (21:59 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button" am:
ca8b270063 am:
d4b6e59cad
am:
3674a64029
Change-Id: Iaac0047f43ebfb721a1d632686e1c0afad44cb96
Adam Lesinski [Tue, 3 Oct 2017 21:51:09 +0000 (21:51 +0000)]
Merge "AAPT2: Preserve line numbers when deserializing from binary XML" into oc-mr1-dev
am:
9b581c7bc1
Change-Id: I55d8c73df0ce751472e58a9ae505c94edc90c68e
Felipe Leme [Tue, 3 Oct 2017 21:48:43 +0000 (14:48 -0700)]
Fixed URL used on sample.
Test: nope!
Bug:
66963249
Change-Id: Ieb46c00d97c8657a4e7498a8136c6da46760fbdd
Selim Cinek [Tue, 3 Oct 2017 21:45:55 +0000 (21:45 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button" am:
ca8b270063
am:
d4b6e59cad
Change-Id: Ib6f48bc7bf8f6cfae5f66adcdd7923891c320f99
Wonsik Kim [Tue, 3 Oct 2017 21:42:14 +0000 (21:42 +0000)]
Merge "fix AmrInputStream.read() hang" am:
5b6a02eb8b am:
4c2bbbf552
am:
b7079d6381
Change-Id: Ia0627f67855e56487818043b974953a33baf701f
Wonsik Kim [Tue, 3 Oct 2017 21:30:17 +0000 (21:30 +0000)]
Merge "fix AmrInputStream.read() hang" am:
5b6a02eb8b
am:
4c2bbbf552
Change-Id: I6764a29474ec9da78109e93c6a4f85ac3f8c2c1a
Selim Cinek [Tue, 3 Oct 2017 21:30:14 +0000 (21:30 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button"
am:
ca8b270063
Change-Id: I3ce745ab3546fa93aa0cafa7874b8449e6d2cfc9
TreeHugger Robot [Tue, 3 Oct 2017 21:24:48 +0000 (21:24 +0000)]
Merge "AAPT2: Fix R.java styleable + indices ordering" into oc-mr1-dev
TreeHugger Robot [Tue, 3 Oct 2017 21:24:16 +0000 (21:24 +0000)]
Merge "AAPT2: Preserve line numbers when deserializing from binary XML" into oc-mr1-dev
Brad Ebinger [Tue, 3 Oct 2017 21:23:01 +0000 (21:23 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" am:
177bd65211 am:
387b90aa97
am:
6ed82dc67b
Change-Id: Iab96a457f45f759267b9a5a41df533c9988ede94
Wonsik Kim [Tue, 3 Oct 2017 21:18:10 +0000 (21:18 +0000)]
Merge "fix AmrInputStream.read() hang"
am:
5b6a02eb8b
Change-Id: I7aff9043ec95d2f41e5d3301b01707f5dff4bef2
Brad Ebinger [Tue, 3 Oct 2017 21:13:34 +0000 (21:13 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" am:
177bd65211
am:
387b90aa97
Change-Id: I4332a7f839aec731acaafbb9fa6213f2ada39857
Felipe Leme [Tue, 3 Oct 2017 18:41:52 +0000 (11:41 -0700)]
Improved javadocs for Autofill save workflow.
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Bug:
67367585
Change-Id: I25e0f2f6667a4fad6e039f9518c973bac0bc8c7c
Selim Cinek [Tue, 3 Oct 2017 21:07:57 +0000 (21:07 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button"
Brad Ebinger [Tue, 3 Oct 2017 20:55:50 +0000 (20:55 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback"
am:
177bd65211
Change-Id: I64950a42e8079a41105d90ea6c584ca6f940a64e
Julia Reynolds [Tue, 3 Oct 2017 20:53:31 +0000 (20:53 +0000)]
Merge "Foreground service notis must be correctly formed." into oc-mr1-dev
am:
f2c00946e0
Change-Id: Idf833e388c4c2959f56ffa00befdda4e4a71001e
Chris Wren [Tue, 3 Oct 2017 20:40:55 +0000 (20:40 +0000)]
Merge "measure snooze UI use more precisely" into oc-mr1-dev
am:
72826c99fa
Change-Id: I1304ace99258426667059dd98c51ea7d4e10b00c
Treehugger Robot [Tue, 3 Oct 2017 20:37:36 +0000 (20:37 +0000)]
Merge "fix AmrInputStream.read() hang"
Brad Ebinger [Fri, 29 Sep 2017 18:04:05 +0000 (11:04 -0700)]
Remove verification for DownloadReceiver when failure
When the ACTION_DOWNLOAD_RESULT_INTERNAL intent is received
with a failure result, don't require that extras exist
in the receiver.
Test: Manual, Testapps
Bug:
67112896
Merged-In: I9ce32afc0c6e99b0a61e05a2d2b65855f054abd9
Change-Id: I9ac43a33aff88755cbc804890ce230743195f44d
Brad Ebinger [Fri, 29 Sep 2017 01:00:46 +0000 (18:00 -0700)]
Decouple Content Name Locale from Content Language Locale
There was an assumption that content language Locale was
a 1:1 mapping with content locale name, which is not the
case. This change separates the two and provides a new
API for retreiving the set of Locales for content name.
Test: Manual
Bug:
67112896
Merged-In: If87094f15e3a1dfe36d37745ed3d2cf79cc441f1
Change-Id: I44cb527ceb77fe321500f9d5fc00f6880ee52cb7
Daniel Nishi [Tue, 3 Oct 2017 20:31:09 +0000 (20:31 +0000)]
Merge "Fix a cache calculation regression." into oc-mr1-dev
am:
fcd9565ec5
Change-Id: If0d8f5a0e54a71899c2f878c61747223579bf24a
TreeHugger Robot [Tue, 3 Oct 2017 20:23:32 +0000 (20:23 +0000)]
Merge "Foreground service notis must be correctly formed." into oc-mr1-dev
Brad Ebinger [Tue, 3 Oct 2017 20:23:00 +0000 (20:23 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback"
Chris Wren [Tue, 3 Oct 2017 20:16:58 +0000 (20:16 +0000)]
Merge "measure snooze UI use more precisely" into oc-mr1-dev
Daniel Nishi [Tue, 3 Oct 2017 20:11:26 +0000 (20:11 +0000)]
Merge "Fix a cache calculation regression." into oc-mr1-dev
Brad Ebinger [Tue, 3 Oct 2017 19:16:08 +0000 (19:16 +0000)]
Merge "Remove verification for DownloadReceiver when failure" am:
f78beae681 am:
354eed7bac
am:
91c55f189c
Change-Id: I9ce32afc0c6e99b0a61e05a2d2b65855f054abd9
Brad Ebinger [Tue, 3 Oct 2017 19:07:46 +0000 (19:07 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale" am:
a830e83028 am:
768b6c5e4a
am:
4b76f8420f
Change-Id: If87094f15e3a1dfe36d37745ed3d2cf79cc441f1