OSDN Git Service
Wale Ogunwale [Fri, 23 Jun 2017 02:27:28 +0000 (02:27 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898
am:
e30da86a46
Change-Id: Idad772522638c93a1d2a042aa374ec2cabf55167
Wale Ogunwale [Fri, 23 Jun 2017 02:19:26 +0000 (02:19 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
am:
b55b842898
Change-Id: I5b73df5e46d26d2008dba7a34345a0c37c099514
TreeHugger Robot [Fri, 23 Jun 2017 02:10:32 +0000 (02:10 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
Badhri Jagan Sridharan [Fri, 23 Jun 2017 02:07:57 +0000 (02:07 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev
am:
025b07c38e
Change-Id: Icd1d42fd0fb301f68dae38a242760035c1f6dfec
TreeHugger Robot [Fri, 23 Jun 2017 01:58:19 +0000 (01:58 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev
Android Build Merger (Role) [Fri, 23 Jun 2017 00:48:12 +0000 (00:48 +0000)]
Merge "Improved documentation for AutofillService package: am:
2ef19c1d73 am:
91d763f1b5" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 23 Jun 2017 00:44:53 +0000 (00:44 +0000)]
Improved documentation for AutofillService package: am:
2ef19c1d73
am:
91d763f1b5
Change-Id: Iecf6e6d7f5461f944b1f3e23e9f97ccca5029983
Felipe Leme [Fri, 23 Jun 2017 00:44:47 +0000 (00:44 +0000)]
Improved documentation for AutofillService package: am:
2ef19c1d73
am:
472b4c834f
Change-Id: I9636c277b82569e6ffa684df26358a6a7c36d3c2
Felipe Leme [Fri, 23 Jun 2017 00:36:37 +0000 (00:36 +0000)]
Improved documentation for AutofillService package:
am:
2ef19c1d73
Change-Id: Iac283d34da149829a25313d0910f2564b347e332
Felipe Leme [Fri, 23 Jun 2017 00:36:35 +0000 (00:36 +0000)]
Improved documentation for AutofillService package:
am:
2ef19c1d73
Change-Id: I67d6649d4acb84ebb598c1ebceb3c3ed58cfd0c0
Charlie Wang [Thu, 22 Jun 2017 23:47:55 +0000 (23:47 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev
am:
d43bc31eb7
Change-Id: I4a82f38e753d7ba61ec37b7ecd959e588eee21e3
Wale Ogunwale [Thu, 22 Jun 2017 23:43:53 +0000 (16:43 -0700)]
Dump user id in dumpsys activity starter
To help with ANR debugging.
Test: adb shell dumpsys activity starter
Bug:
38121026
Change-Id: I96d530662e6a362b817df3ca8410cb173a2c0dd4
Badhri Jagan Sridharan [Thu, 22 Jun 2017 23:39:47 +0000 (16:39 -0700)]
Log call to setPortRoles
Came of bunch of bugs, for instance b/
62912250 where some app is
forcing the port role. Logging which package is doing this
Change-Id: I234db3292326d247c82723989b46160fcbd59c10
Charlie Wang [Thu, 22 Jun 2017 23:35:20 +0000 (23:35 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev
Ying Xu [Thu, 22 Jun 2017 23:29:50 +0000 (23:29 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev
am:
9523a12b95 -s ours
Change-Id: I4b2f10eab109ef9e912fd0a6674fa3e7341b1e8d
Ying Xu [Thu, 22 Jun 2017 23:19:57 +0000 (23:19 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev
Siddharth Ray [Thu, 22 Jun 2017 23:05:24 +0000 (23:05 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev
am:
424e517d5d
Change-Id: I4d7c458c02e3de1d707c6314102bb8b00fe2bda6
TreeHugger Robot [Thu, 22 Jun 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev
Stephen Chen [Thu, 22 Jun 2017 22:56:27 +0000 (22:56 +0000)]
Add strings for revamped Wi-Fi ONA notification.
am:
2e8351b308
Change-Id: I0ceb50c182c3ea023167915d28cf04d79f75d8eb
Alan Leung [Thu, 22 Jun 2017 22:50:42 +0000 (22:50 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp
am:
643275b838
Change-Id: Idb669d7b381f8291fb44dcc5a4d1824d118319d9
Todd Kennedy [Thu, 22 Jun 2017 22:47:18 +0000 (22:47 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e
am:
921fc1426f
Change-Id: I322d7d8b576e00ad10d85d462873c10cce712951
Stephen Chen [Wed, 7 Jun 2017 22:49:13 +0000 (15:49 -0700)]
Add strings for revamped Wi-Fi ONA notification.
Bug:
37357441
Test: n/a
Change-Id: Ib32581f044db9827a700be8af1864af15f6dbb3e
Android Build Merger (Role) [Thu, 22 Jun 2017 22:37:54 +0000 (22:37 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Jun 2017 22:36:49 +0000 (22:36 +0000)]
Merge "Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e am:
20fad610b9" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 22 Jun 2017 22:35:52 +0000 (22:35 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e
am:
20fad610b9
Change-Id: I6d6fd8f320fef01c2a89463ce0f72f0f880e1e45
Android Build Merger (Role) [Thu, 22 Jun 2017 22:34:52 +0000 (22:34 +0000)]
Merge "Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c am:
9e391f9f86" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 22 Jun 2017 22:35:06 +0000 (22:35 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
am:
16503a8f7e
Change-Id: I13cf0e00de235d0bbdb79aa553e04386c519975d
Alan Leung [Thu, 22 Jun 2017 22:34:29 +0000 (22:34 +0000)]
Merge "ASM Priority Boost Tool" am:
8ff8dd16cc
am:
8ac18ceb8a
Change-Id: I68f86f307368de6870a7d649118d1a0f8c744a88
Rob Carr [Thu, 22 Jun 2017 22:33:51 +0000 (22:33 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c
am:
9e391f9f86
Change-Id: I8566d935ec735b360af54998599a8ce185fcf9ee
Rob Carr [Thu, 22 Jun 2017 22:32:07 +0000 (22:32 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c
am:
874b6402af
Change-Id: I3db14694bc27e9fed16b5efec6aba99570b89675
Todd Kennedy [Thu, 22 Jun 2017 22:26:34 +0000 (22:26 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
am:
16503a8f7e
Change-Id: Ia20de35097f3b5b139afc5ccee59d71584f59a3a
Felipe Leme [Mon, 5 Jun 2017 18:32:32 +0000 (11:32 -0700)]
Improved documentation for AutofillService package:
- Moved (and expanded) overall documentation from FillResponse to
AutofillService.
- Improved SaveInfo documentation.
- Improved FillRequest documentation.
- Improved Dataset documentation.
Bug:
37567048
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Change-Id: I157893deac06a5ed5e1cb7fd082da485f227b9ee
Alan Leung [Thu, 22 Jun 2017 22:24:51 +0000 (22:24 +0000)]
Merge "ASM Priority Boost Tool"
am:
8ff8dd16cc
Change-Id: Ifb62ee3132e984340e4457b543c4f84f7c45995a
Rob Carr [Thu, 22 Jun 2017 22:23:19 +0000 (22:23 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am:
82b41e460c
Change-Id: I47c8e096ccd513eb65fa9fd2a34fc75fa222a42c
Rob Carr [Thu, 22 Jun 2017 22:19:45 +0000 (22:19 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am:
82b41e460c
Change-Id: I14f6fe76b3a24266432a8bc7286d1ae5da8f719d
TreeHugger Robot [Thu, 22 Jun 2017 22:11:44 +0000 (22:11 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
Treehugger Robot [Thu, 22 Jun 2017 22:10:56 +0000 (22:10 +0000)]
Merge "ASM Priority Boost Tool"
Rob Carr [Thu, 22 Jun 2017 22:08:03 +0000 (22:08 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
Neil Fuller [Thu, 22 Jun 2017 21:56:18 +0000 (21:56 +0000)]
Merge "Fix code and test related to rules version check" am:
a3579d4b84 am:
c506ade205
am:
af32c3d234
Change-Id: I2dc13436ceb93eb620dcaaa6d141210dc57ea1fc
Android Build Merger (Role) [Thu, 22 Jun 2017 21:53:47 +0000 (21:53 +0000)]
Merge "Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1 am:
e9ede0548b" into oc-dr1-dev-plus-aosp
Shubang [Thu, 22 Jun 2017 21:51:37 +0000 (21:51 +0000)]
Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1
am:
e9ede0548b
Change-Id: Ifecd856ffeb53c3a7249caa58fdb98dff71f4b93
Shubang [Thu, 22 Jun 2017 21:51:34 +0000 (21:51 +0000)]
Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1
am:
745bbf758d
Change-Id: I73fd01b193324ab9b4c1320e47ab8be1d77a3cc2
Neil Fuller [Thu, 22 Jun 2017 21:49:28 +0000 (21:49 +0000)]
Merge "Fix code and test related to rules version check" am:
a3579d4b84
am:
c506ade205
Change-Id: Ia72b94700d1a65de769beace27e699e62aedcd9f
Shubang [Thu, 22 Jun 2017 21:44:18 +0000 (21:44 +0000)]
Merge "Change PIP notification icon" into oc-dev
am:
9f3967fee1
Change-Id: I5c42cb241ef98bc5e70b03d460230e3ac2115240
Shubang [Thu, 22 Jun 2017 21:44:18 +0000 (21:44 +0000)]
Merge "Change PIP notification icon" into oc-dev
am:
9f3967fee1
Change-Id: I1f12ec16adaa173d90ffbb62c5a88387340e4042
Maurice Lam [Thu, 22 Jun 2017 21:44:10 +0000 (21:44 +0000)]
Merge "Add tintable icon support" into oc-dr1-dev
am:
53d79aa8ea
Change-Id: I11e1a99d8482871ac0c2fac0761f77d0a57f6938
Neil Fuller [Thu, 22 Jun 2017 21:37:48 +0000 (21:37 +0000)]
Merge "Fix code and test related to rules version check"
am:
a3579d4b84
Change-Id: I2021e64f04e0e55de21dcdc0a932ce535e6a7f9f
TreeHugger Robot [Thu, 22 Jun 2017 21:33:39 +0000 (21:33 +0000)]
Merge "Add tintable icon support" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 21:31:56 +0000 (21:31 +0000)]
Merge "Change PIP notification icon" into oc-dev
Treehugger Robot [Thu, 22 Jun 2017 21:23:52 +0000 (21:23 +0000)]
Merge "Fix code and test related to rules version check"
Alan Leung [Sat, 13 May 2017 00:31:13 +0000 (17:31 -0700)]
ASM Priority Boost Tool
This tool is a replacement for the Jack plugin that allows injection
of static method calls before lock enter and exit.
A common use case would be to boost a thread's priority as soon as
it acquires a heavily contented lock and resetting the priority upon
release.
This tool is meant to be optionally invoked from /build/core/ rules
during the build process.
Test: JUnit Tests / resulting image on a bullhead.
Change-Id: If400414a0bf50f03768a1de2ebee42086a9d701f
Merged-In: If400414a0bf50f03768a1de2ebee42086a9d701f
(cherry picked from commit
93db63059ad5e9e1d59c8ce013559069d566ef4c)
Android Build Merger (Role) [Thu, 22 Jun 2017 20:44:57 +0000 (20:44 +0000)]
Merge "Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2 am:
0e068632ef" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Thu, 22 Jun 2017 20:43:54 +0000 (20:43 +0000)]
Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2
am:
0e068632ef
Change-Id: I70d155d214a70fb451bb7468d91e782f0f6f4d49
Android Build Merger (Role) [Thu, 22 Jun 2017 20:43:15 +0000 (20:43 +0000)]
Merge "Merge "Add a common call when wrapping an app." am:
12e0975963 am:
bb6cf84a40 am:
1d10ce12ff" into oc-dr1-dev-plus-aosp
Christopher Ferris [Thu, 22 Jun 2017 20:42:00 +0000 (20:42 +0000)]
Merge "Add a common call when wrapping an app." am:
12e0975963 am:
bb6cf84a40
am:
1d10ce12ff
Change-Id: Ib814bcfc56ad6742a023bd7245952cefd51d5fd2
Android Build Merger (Role) [Thu, 22 Jun 2017 20:41:30 +0000 (20:41 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c am:
206f1ef043" into oc-dr1-dev-plus-aosp
Lucas Dupin [Thu, 22 Jun 2017 20:39:59 +0000 (20:39 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c
am:
206f1ef043
Change-Id: I3ee03acf859868b9225f1e90d537013875dc7e18
Jason Monk [Thu, 22 Jun 2017 20:36:32 +0000 (20:36 +0000)]
Merge "Make default status bar padding 8dp" into oc-dr1-dev
am:
5af936f31e
Change-Id: Ie735752778c98b3d8ee37c32f5bca175abb4e62d
Android Build Merger (Role) [Thu, 22 Jun 2017 20:32:46 +0000 (20:32 +0000)]
Merge "Merge "GnssLocationProvider: listening to conn lost event" into oc-dr1-dev am:
9564b4d168" into oc-dr1-dev-plus-aosp
Kevin Tang [Thu, 22 Jun 2017 20:29:58 +0000 (20:29 +0000)]
Merge "GnssLocationProvider: listening to conn lost event" into oc-dr1-dev
am:
9564b4d168
Change-Id: I02b2533b777d228d298283697aabaaf0602b567d
Jason Monk [Thu, 22 Jun 2017 20:29:32 +0000 (20:29 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744
am:
9980bade09
Change-Id: Ic00fae7701ddb74914e7154fb878ffe4a48a9b55
Neil Fuller [Thu, 22 Jun 2017 16:58:02 +0000 (17:58 +0100)]
Fix code and test related to rules version check
Fix code and test related to an incorrectly implemented
rules version check.
This meant that a device could not return the rules version
it shipped with.
Another unused (and also confusing) method and
associated test is being deleted here.
To run tests:
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"
Test: See above.
Bug:
31008728
Change-Id: I31b55e88072dd73055cb3d8cf252be6eac920322
TreeHugger Robot [Thu, 22 Jun 2017 20:20:39 +0000 (20:20 +0000)]
Merge "Make default status bar padding 8dp" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 20:19:04 +0000 (20:19 +0000)]
Merge "GnssLocationProvider: listening to conn lost event" into oc-dr1-dev
Android Build Merger (Role) [Thu, 22 Jun 2017 20:16:55 +0000 (20:16 +0000)]
Merge "Merge "Ensure that android.test tests pass" am:
156775fea8 am:
34dc5a58b3 am:
e211119fea" into oc-dr1-dev-plus-aosp
Paul Duffin [Thu, 22 Jun 2017 20:15:27 +0000 (20:15 +0000)]
Merge "Ensure that android.test tests pass" am:
156775fea8 am:
34dc5a58b3
am:
e211119fea
Change-Id: I4692f9a86dae8bb2c5476eb477924230034cdd6b
Android Build Merger (Role) [Thu, 22 Jun 2017 20:14:25 +0000 (20:14 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038 -s ours am:
78def25969 -s ours" into oc-dr1-dev-plus-aosp
Siddharth Ray [Wed, 21 Jun 2017 22:14:44 +0000 (15:14 -0700)]
Emergency SUPL when location is disabled
A cycle of native_init() and native_cleanup() is needed so that
callbacks are registered after bootup even when location is disabled.
This will allow Emergency SUPL to work even when location is disabled
before device restart.
BUG:
38362097
Change-Id: I423d5a7142709fc0579be009bb8b14d3778aa090
Erik Kline [Thu, 22 Jun 2017 20:12:59 +0000 (20:12 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038 -s ours
am:
78def25969 -s ours
Change-Id: I73ca21bc6efe5b8d015e10cf562a0e48c5144b21
Android Build Merger (Role) [Thu, 22 Jun 2017 20:12:37 +0000 (20:12 +0000)]
Merge "Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev am:
8ac5a94c01" into oc-dr1-dev-plus-aosp
Evan Laird [Thu, 22 Jun 2017 20:11:23 +0000 (20:11 +0000)]
Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev
am:
8ac5a94c01
Change-Id: I4ada7c21457a3222274998269d565a9bf03fdc46
Narayan Kamath [Thu, 22 Jun 2017 20:09:25 +0000 (20:09 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e
am:
8bc86321ff
Change-Id: Id6edece20054d7725ca206bfa1d6c6b270bcef97
Erik Kline [Thu, 22 Jun 2017 20:02:45 +0000 (20:02 +0000)]
Only disable Wi-Fi IP serving on specific interface, if available am:
c8b180116d -s ours
am:
8fac8d8904 -s ours
Change-Id: Ia09a0a082c7f6e69c33e0426b7e8566fe7c9f3f8
TreeHugger Robot [Thu, 22 Jun 2017 20:00:23 +0000 (20:00 +0000)]
Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev
Charlie Wang [Wed, 14 Jun 2017 21:46:39 +0000 (14:46 -0700)]
Adding tron logging events for standalone headsets.
Standalone headsets will use tron to log headset events.
Bug:
62103076
Test: Builds and logger can log events
Change-Id: I761ddae4501aa8b8d0d9dacc91f04fd13a2c771c
Wale Ogunwale [Thu, 22 Jun 2017 19:58:40 +0000 (19:58 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
am:
182d5ec2d2
Change-Id: I50d3778a7874656803a38594c0cdb1a5f95be123
Wale Ogunwale [Thu, 22 Jun 2017 19:52:20 +0000 (19:52 +0000)]
Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2
am:
a9c161bc28
Change-Id: I5e0a99a9b56bd0cb649fbd345e8fa0f6d6fe146e
Android Build Merger (Role) [Thu, 22 Jun 2017 19:48:06 +0000 (19:48 +0000)]
Merge "Merge "ConnectivityManager: fix style issue" am:
e74f3adba5 am:
ec54a40339 am:
ec7447b291" into oc-dr1-dev-plus-aosp
Hugo Benichi [Thu, 22 Jun 2017 19:46:28 +0000 (19:46 +0000)]
Merge "ConnectivityManager: fix style issue" am:
e74f3adba5 am:
ec54a40339
am:
ec7447b291
Change-Id: Iecf5399d77ae742cc66ac7a3cab4570464c4e95f
Wale Ogunwale [Thu, 22 Jun 2017 19:45:21 +0000 (19:45 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
am:
182d5ec2d2
Change-Id: I6a1ac4ceee2ba943965382fc5cb7c782249b19a2
Jason Monk [Thu, 22 Jun 2017 19:45:06 +0000 (19:45 +0000)]
Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev
am:
cc9ff706a4
Change-Id: I9852ed8eeeb32aff7150b367c1ba2a6861eddb43
Todd Kennedy [Thu, 22 Jun 2017 19:40:39 +0000 (12:40 -0700)]
Allow any app to dynamically install a split
Any application starting an activity resolved to a dyanmic split
should initiate split installation. Previously, only the application
defining the split could start installation of the split.
Bug:
62872325
Test: Manual; install instant app and start intent using 'adb shell am' and see that dynamic split installation occurs
Change-Id: I232dc5df82fb2c04653015a4a6b9f07c9e382205
Joel Scherpelz [Thu, 22 Jun 2017 19:38:18 +0000 (19:38 +0000)]
Merge "Use RFC 7217 stable privacy addresses" am:
a88b12ce5e am:
4c4d5477d4
am:
8a4667b911
Change-Id: I60e9d4e630ffb6f6ff6870102d4620c5c4c81c47
Erik Kline [Thu, 22 Jun 2017 19:35:47 +0000 (19:35 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev am:
c0af382a25 -s ours
am:
0ba9285c7d -s ours
Change-Id: Id02582c55ed51dfbe007967a74bcacc1d3b76c42
TreeHugger Robot [Thu, 22 Jun 2017 19:30:40 +0000 (19:30 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
Felipe Leme [Thu, 22 Jun 2017 19:30:32 +0000 (19:30 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev am:
6358cdcd28
am:
95e074dab3
Change-Id: I03fbf818566f8c7601176dfd776edd24c126e27d
TreeHugger Robot [Thu, 22 Jun 2017 19:29:58 +0000 (19:29 +0000)]
Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev
Amith Yamasani [Thu, 22 Jun 2017 19:27:46 +0000 (19:27 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722
am:
5d45ac6e68
Change-Id: I9058c3a0140102c324e0c7c8e5ec88f40a3e126a
Chen Xu [Thu, 22 Jun 2017 19:23:19 +0000 (19:23 +0000)]
Merge "resolve merge conflicts of
187fe9d5cf3c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
fionaxu [Thu, 22 Jun 2017 19:11:02 +0000 (12:11 -0700)]
resolve merge conflicts of
187fe9d5cf3c to oc-dr1-dev-plus-aosp
Change-Id: I2cbfdd9b0fcf024509dbda84678ef067add014f9
Jason Monk [Thu, 22 Jun 2017 19:01:00 +0000 (19:01 +0000)]
Merge "Bring back transparency for QS" into oc-dr1-dev
am:
d037c6ac36
Change-Id: I8313648e66b97401ce81f9188823ddb9488dcb9f
jackqdyulei [Thu, 22 Jun 2017 18:57:52 +0000 (18:57 +0000)]
Merge "Add metric for anomaly action" into oc-dr1-dev
am:
378965aee1
Change-Id: I6c4906702b9b4c7612cd4e75a427d424bfb75853
Robert Carr [Wed, 21 Jun 2017 17:25:05 +0000 (10:25 -0700)]
ListPopupWindow: Wrap new bounds checking in targetSdk check.
While a negative height is pretty silly, crashing apps on
the new version of android makes them sad.
Test: Existing CTS passes.
Bug:
62434804
Change-Id: I5fc3fc50fb6ccfa9e96f38ded4fb8e338f263f09
TreeHugger Robot [Thu, 22 Jun 2017 18:52:45 +0000 (18:52 +0000)]
Merge "Bring back transparency for QS" into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 18:51:21 +0000 (18:51 +0000)]
Merge "Add test for StatusBar.dump" into oc-dr1-dev
am:
4448d47ed2
Change-Id: I902114ceacb651690939851b9f2927d0f9bc0eaf
TreeHugger Robot [Thu, 22 Jun 2017 18:46:07 +0000 (18:46 +0000)]
Merge "Add metric for anomaly action" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 18:41:57 +0000 (18:41 +0000)]
Merge "Add test for StatusBar.dump" into oc-dr1-dev
Christopher Ferris [Thu, 22 Jun 2017 18:40:30 +0000 (18:40 +0000)]
Merge "Add a common call when wrapping an app." am:
12e0975963
am:
bb6cf84a40
Change-Id: I5a52a1cdfa5994f3f8c44e367c3a0bdbfba838fd
Christopher Ferris [Thu, 22 Jun 2017 18:32:22 +0000 (18:32 +0000)]
Merge "Add a common call when wrapping an app."
am:
12e0975963
Change-Id: I81830a6d826cd109c99f6e857204f96da9d4a656
Christopher Ferris [Thu, 22 Jun 2017 18:22:07 +0000 (18:22 +0000)]
Merge "Add a common call when wrapping an app."
OSDN Git Service
