OSDN Git Service
Andre Eisenbach [Thu, 29 Jun 2017 08:39:40 +0000 (08:39 +0000)]
Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)"
am:
5790bae2f4
Change-Id: I480ef38d5aa61aa153ee53d325e8b249c1eab222
Andre Eisenbach [Thu, 29 Jun 2017 08:30:50 +0000 (08:30 +0000)]
Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)"
Jack He [Thu, 22 Jun 2017 19:56:54 +0000 (12:56 -0700)]
HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)
* Per HFP 1.7.1 spec page 102 of 144
EXTRA_HF_INDICATORS_IND_ID should be int
EXTRA_HF_INDICATORS_IND_VALUE should be int
Bug:
35874078
Test: make, PTS test, unit tests
runtest -c com.android.bluetooth.btservice.RemoteDevicesTest bluetooth
Change-Id: Idd316a82bab164b6ea1701bb261b1cc3dee196f1
yinxu [Thu, 29 Jun 2017 02:05:53 +0000 (02:05 +0000)]
Merge "Use Bundle for inter-process message"
am:
db8e4efd5b
Change-Id: Ib93e91969063a5d2276c99b8b0fee4dd1a398771
Treehugger Robot [Thu, 29 Jun 2017 01:51:04 +0000 (01:51 +0000)]
Merge "Use Bundle for inter-process message"
Hall Liu [Wed, 28 Jun 2017 20:36:49 +0000 (20:36 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
am:
c2f33f18eb
Change-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81
Hall Liu [Wed, 28 Jun 2017 20:35:54 +0000 (20:35 +0000)]
Add download request tokens and enforce destination clear
am:
2043f70acb
Change-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f
Hall Liu [Wed, 28 Jun 2017 20:26:15 +0000 (20:26 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
* changes:
Implement the cleanup action in MbmsDownloadReceiver
Add download request tokens and enforce destination clear
yinxu [Tue, 27 Jun 2017 21:05:17 +0000 (14:05 -0700)]
Use Bundle for inter-process message
The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.
Cherry-picked cleanly from:
https://googleplex-android-review.googlesource.com/#/c/
2467157/
Test: Telephony sanity tests
Bug:
30954762
Merged-in: I77945b247530b85c0b82876d528549498a711550
Changg-Id: I77945b247530b85c0b82876d528549498a711550
(cherry picked from commit
56049437095d3cb8334f667ff73061f2926b5416)
Change-Id: Iec4043e611a8f58733a361ec9a52fc74e1c974d5
Neil Fuller [Wed, 28 Jun 2017 17:13:35 +0000 (17:13 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage"
am:
4e77ae6d1a
Change-Id: Ib30177ef93ecacfbd6ab0fb98f933fbf8af0e270
Neil Fuller [Wed, 28 Jun 2017 17:01:56 +0000 (17:01 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage"
Jack He [Wed, 28 Jun 2017 08:32:54 +0000 (08:32 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)"
am:
ceaccbfe70
Change-Id: Ic3253ef666632aaaffe8e1547dc563cd3bca9e37
Treehugger Robot [Wed, 28 Jun 2017 08:26:13 +0000 (08:26 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)"
Hall Liu [Thu, 22 Jun 2017 01:23:48 +0000 (18:23 -0700)]
Implement the cleanup action in MbmsDownloadReceiver
Implement ACTION_CLEANUP, add result codes for the ordered broadcasts,
and remove the download request extra for file descriptor requests
Change-Id: I5ee19ad0aefbdceacb636b3d17e197a6fb1bdaa6
Jack He [Sat, 17 Jun 2017 02:43:58 +0000 (19:43 -0700)]
Add APIs to get remote device's battery level (1/2)
* Add BluetoothDevice.getBatteryLevel() API to retreive battery level
information of remote device
* Add BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent to notify user
that remote device's battery level has changed
Bug:
35874078
Test: make, pair with devices and use them
Change-Id: I41051ee25383f5f3a1e505aef6f8c526385f58bd
Brad Ebinger [Tue, 27 Jun 2017 16:57:11 +0000 (16:57 +0000)]
Merge "IMS: Check for binderstate before calling endSession"
am:
c49534cf09
Change-Id: I9d173693c466b7d8512d11f266af48f5307669d5
Brad Ebinger [Tue, 27 Jun 2017 16:46:57 +0000 (16:46 +0000)]
Merge "IMS: Check for binderstate before calling endSession"
Neil Fuller [Tue, 27 Jun 2017 12:05:17 +0000 (12:05 +0000)]
Merge "Switch to streaming data for time zone update"
am:
f093d4e13e
Change-Id: I3fd22fe47e1d7b86d4f88d527940c6812ecfa31b
Neil Fuller [Tue, 27 Jun 2017 11:56:53 +0000 (11:56 +0000)]
Merge "Switch to streaming data for time zone update"
Paul Duffin [Tue, 27 Jun 2017 11:27:41 +0000 (11:27 +0000)]
Merge "Clean up Predicate related code in android.test"
am:
1230b249f1 -s ours
Change-Id: I4836793deccd83e06129ad18035f4f4acf5f8617
Paul Duffin [Tue, 27 Jun 2017 10:52:39 +0000 (10:52 +0000)]
Merge "Clean up ClassPathPackageInfoSource"
am:
8c7026c5a3
Change-Id: I503ae16c4d47ce3cecb79987da919c7f579347da
Paul Duffin [Tue, 27 Jun 2017 10:42:56 +0000 (10:42 +0000)]
Merge "Clean up Predicate related code in android.test"
Paul Duffin [Tue, 27 Jun 2017 10:42:51 +0000 (10:42 +0000)]
Merge "Clean up ClassPathPackageInfoSource"
Benergy Meenan Ravuri [Tue, 20 Jun 2017 11:30:42 +0000 (17:00 +0530)]
IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.
Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.
Notify Ims state change only for the supported feature state
change to clients.
Test: Manual
Bug:
62816014
Change-Id: I1bb588ce2be9c181355ff744f43dad4e784e4ec5
Sean Lu [Mon, 26 Jun 2017 22:59:35 +0000 (22:59 +0000)]
Merge "[Resources] house keeping in TypeList"
am:
ff2e03cfce
Change-Id: I22b0a87776d794f23f70f2f9d8d885761c0b8d14
Treehugger Robot [Mon, 26 Jun 2017 22:50:23 +0000 (22:50 +0000)]
Merge "[Resources] house keeping in TypeList"
Bryce Lee [Mon, 26 Jun 2017 20:58:56 +0000 (20:58 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev
am:
61196fef1f
Change-Id: I1ead0fd55eb35fd69a4c8e3de5a1449ce296edd9
Bryce Lee [Mon, 26 Jun 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev
Todd Kennedy [Mon, 26 Jun 2017 20:13:41 +0000 (20:13 +0000)]
Merge "Filter instant apps with different names" into oc-dev
am:
adcc94f160
Change-Id: I855a58e6ea0655b4211f2aac0a4a1f9f94f639f2
Jason Monk [Mon, 26 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
am:
aa2286e417
Change-Id: I40a6e211fa02a83de09edcfac419b8e78a287e2f
TreeHugger Robot [Mon, 26 Jun 2017 20:06:19 +0000 (20:06 +0000)]
Merge "Filter instant apps with different names" into oc-dev
TreeHugger Robot [Mon, 26 Jun 2017 19:59:20 +0000 (19:59 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
Chet Haase [Mon, 26 Jun 2017 18:18:46 +0000 (18:18 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev
am:
7b95c932d6
Change-Id: I9ec629e60882aec2b4ca84b0b81de4244d43afef
Chet Haase [Mon, 26 Jun 2017 18:07:25 +0000 (18:07 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev
Todd Kennedy [Mon, 26 Jun 2017 17:34:41 +0000 (10:34 -0700)]
Filter instant apps with different names
ag/
2447596 introduced a regression that caused instant apps to be
made visible to one another.
Change-Id: I5db9a43f05dd5bec991cc0934b1c9a9406dfade6
Fixes:
62998487
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Jason Monk [Mon, 26 Jun 2017 15:22:21 +0000 (11:22 -0400)]
Fix QS lock screen animation
Now that we have a footer, heights and clippings need to be adjusted
to be more accurate.
- Clip QS within its layout box regardless of its y translation
- Calculate height diffs correctly
Test: visual
Change-Id: Ic46996e342cd1000215aa9256da920a7856bb5a4
Fixes:
62489284
Ying Xu [Mon, 26 Jun 2017 17:27:21 +0000 (17:27 +0000)]
Merge "Fix the inconsistency of scan status." am:
41be35a1bd
am:
ac2d00a195
Change-Id: Ibcdbe63349031ea95d137dd18465bec5de6efd7a
Ying Xu [Mon, 26 Jun 2017 17:18:42 +0000 (17:18 +0000)]
Merge "Fix the inconsistency of scan status."
am:
41be35a1bd
Change-Id: Ic92aa1aa9ecd91cd072257c93e12cdf030cdeba8
Todd Kennedy [Mon, 26 Jun 2017 17:10:13 +0000 (17:10 +0000)]
Merge "null check before dereference" into oc-dev
am:
df8569787c
Change-Id: I41f9298e305f6f197120f2b3128187a4cbf6b28a
Ying Xu [Mon, 26 Jun 2017 17:05:57 +0000 (17:05 +0000)]
Merge "Fix the inconsistency of scan status."
TreeHugger Robot [Mon, 26 Jun 2017 16:59:31 +0000 (16:59 +0000)]
Merge "null check before dereference" into oc-dev
Bryce Lee [Mon, 26 Jun 2017 16:35:24 +0000 (16:35 +0000)]
Revert "Add ActivityInfo logging."
This reverts commit
7e84086387cba189bb0c20f9ed17784840a2904a.
Reason for revert: No Longer needed.
Change-Id: Id6a3c66908a0b7b2e6a666f86f30ce05d3964b4b
Paul Duffin [Tue, 20 Jun 2017 15:18:07 +0000 (16:18 +0100)]
Clean up ClassPathPackageInfoSource
Part of the work of removing JUnit and dependent android.test classes
from the Android API involves providing a static library that developers
can include in their test applications to ease migration. That library
will be built directly from the source (as opposed to android.jar which
is built from stubs) and so developers will be able to see classes and
methods that are not present in the stubs. This change is one of a
number of similar changes that cleanup the existing non-API code in
order to minimize the additional methods and classes exposed externally.
The basic approach is to remove unused classes and methods, use least
visible access modifier possible and generally minimize the amount of
publicly visible code.
PackageInfoSources only provided a static field and accessor method so
they were moved into ClassPathPackageInfoSource and PackageInfoSources
was removed.
ClassPathPackageInfo was only used in ClassPathPackageInfoSource and in
TestGrouping. In the latter it was simply used as an intermediate value
between ClassPathPackageInfoSource.getPackage(String packageName) and
ClassPathPackageInfo.getTopLevelClassesRecursive(String packageName).
Moving that method into ClassPathPackageInfoSource allowed the
ClassPathPackageInfo to become an inner class of
ClassPathPackageInfoSource. As it is an inner class it no longer needed
an explicit reference to the containing ClassPathPackageInfoSource.
Bug:
30188076
Test: make checkbuild and ran FrameworkTestRunnerTests
Change-Id: Idb0b6a585030805b9cff8562abb93b7e5920c53a
Pankaj Kanwar [Mon, 26 Jun 2017 15:55:46 +0000 (15:55 +0000)]
Merge "Carrier Config changes to support IMSI encryption." am:
1caaa514c9
am:
e26191a81c
Change-Id: I777010e6fea82f237ddf224525739a5687f13a2c
Pankaj Kanwar [Mon, 26 Jun 2017 15:48:03 +0000 (15:48 +0000)]
Merge "Carrier Config changes to support IMSI encryption."
am:
1caaa514c9
Change-Id: Ia9c4d93e8ababf87a0d6027a4322e73111651844
Pankaj Kanwar [Mon, 26 Jun 2017 15:36:43 +0000 (15:36 +0000)]
Merge "Carrier Config changes to support IMSI encryption."
Neil Fuller [Mon, 26 Jun 2017 15:01:37 +0000 (15:01 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method" am:
fe0b43cb1e
am:
6b5d71f7e5
Change-Id: Ib4d97f72a9fa936beb47267c9e9a888e306ed0e5
Neil Fuller [Mon, 26 Jun 2017 14:53:58 +0000 (14:53 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method"
am:
fe0b43cb1e
Change-Id: I8c263ce15bf29b8a14c862d9acae377ba9be77c3
Todd Kennedy [Mon, 26 Jun 2017 14:51:54 +0000 (07:51 -0700)]
null check before dereference
Change-Id: I6ae219b68920c160e104b307f60802fd75e705ce
Fixes:
62908319
Test: Manual
Paul Duffin [Thu, 22 Jun 2017 09:47:25 +0000 (10:47 +0100)]
Clean up Predicate related code in android.test
Part of the work of removing JUnit and dependent android.test classes
from the Android API involves providing a static library that developers
can include in their test applications to ease migration. That library
will be built directly from the source (as opposed to android.jar which
is built from stubs) and so developers will be able to see classes and
methods that are not present in the stubs. This change is one of a
number of similar changes that cleanup the existing non-API code in
order to minimize the additional methods and classes exposed externally.
The basic approach is to remove unused classes and methods, use least
visible access modifier possible and generally minimize the amount of
publicly visible code.
The HasClassAnnotation and HasMethodAnnotation were never used
separately and only used by HasAnnotation. This merges the functionality
into a single nested class in TestPredicates, hidden behind the new
TestPredicates.hasAnnotation(). The HasAnnotationTest was renamed as
TestPredicatesTest and the HasClassAnnotationTest and
HasMethodAnnotationTest classes were removed as their tests provide no
additional coverage. The removal of the Has*Annotation.java files means
that the test-runner/src/android/test/suitebuilder/annotation/ directory
is empty apart from the package.html file so that was moved to
legacy-test to sit alongside the actual annotation classes.
The Predicates class, while part of the legacy-test module was only
ever used by the test-runner module and only its not() method was
actually used. So, the not() method and associated nested class were
moved to TestPredicates, the tests for not() were moved to
TestPredicatesTest and the Predicates* classes were removed.
That allowed for the removal of the legacy-android-tests as that is now
empty.
TestPredicates has a number of constants that were public. They were
hidden by moving them to the class that actually used them.
A minor generic issue was fixed in AssignableFrom.
Bug:
30188076
Test: make checkbuild and run FrameworkTestRunnerTests
Change-Id: I861da388a4146bb28e1e480d1b7ba9137b7b270e
Paul Duffin [Mon, 26 Jun 2017 14:43:13 +0000 (14:43 +0000)]
Merge "Remove a.t.TestCase" am:
3c5ab7d324
am:
930ab689f0
Change-Id: I0d61b4e26c9551d177b5bb7bbdaab25885976c0d
Treehugger Robot [Mon, 26 Jun 2017 14:40:28 +0000 (14:40 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method"
Paul Duffin [Mon, 26 Jun 2017 14:35:01 +0000 (14:35 +0000)]
Merge "Remove a.t.TestCase"
am:
3c5ab7d324
Change-Id: Id2f80c8bb95e3e64207d937929e027c49e602a72
Paul Duffin [Mon, 26 Jun 2017 14:24:29 +0000 (14:24 +0000)]
Merge "Remove a.t.TestCase"
Neil Fuller [Wed, 17 May 2017 03:43:12 +0000 (04:43 +0100)]
Switch PackageStatusStorage to XML-based storage
Based on feedback from a framework developer: an XML file can be used
instead of a Sqlite DB.
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: I1e6614d26df0e37ccea4dff82867e0b6aba39ca6
Chet Haase [Mon, 26 Jun 2017 13:44:57 +0000 (06:44 -0700)]
Fix TimePicker RTL issues
The TimePicker (seen when creating an alarm in the Clock app) has
two bugs in landscape mode:
- The hours/minutes switch places (hours should always be to the left
of minutes, regardless of RTL)
- The layout is completely messed up in 12-hour mode (the radial time picker
does not appear on the screen)
This fix addresses both issues by setting the layoutDirection="ltr"
attribute to force a couple of the layouts to be unaffected in RTL mode.
Specifically, the hours/minutes layout and the overall layout will always be
presented left-to-right.
Bug:
62846484 TimePicker layout is broken in RTL landscape mode
Test: manual (tested with/without fix in normal, forded-RTL mode, and
with Hebrew as the first locale).
Change-Id: I8ef3f2706660f60c162ba3d324a18b8f370f67f8
Paul Duffin [Mon, 26 Jun 2017 13:15:03 +0000 (13:15 +0000)]
Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp
Hugo Benichi [Mon, 26 Jun 2017 12:07:12 +0000 (12:07 +0000)]
Merge "IpManager: always log immediate provisioning errors" am:
98f2decdad
am:
2d2f66d277
Change-Id: If1e885c13ce7ec1f480add63940bf9bc929d5072
Hugo Benichi [Mon, 26 Jun 2017 11:57:17 +0000 (11:57 +0000)]
Merge "IpManager: always log immediate provisioning errors"
am:
98f2decdad
Change-Id: I6d745a4d6e9b932c16fe54fdabe191962389882d
Hugo Benichi [Mon, 26 Jun 2017 11:43:11 +0000 (11:43 +0000)]
Merge "IpManager: always log immediate provisioning errors"
Paul Duffin [Mon, 26 Jun 2017 11:35:00 +0000 (11:35 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter" am:
1ed43cafb6
am:
4601ebf945
Change-Id: Icf7b8d1f5a3e0d18cd9a096a8171d6dab98b5992
Paul Duffin [Mon, 26 Jun 2017 11:27:36 +0000 (11:27 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter"
am:
1ed43cafb6
Change-Id: If185962713352c4ce4e0ff27bc333e5eededde7f
Paul Duffin [Mon, 26 Jun 2017 11:21:19 +0000 (11:21 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter"
Neil Fuller [Thu, 22 Jun 2017 13:10:29 +0000 (14:10 +0100)]
Switch to streaming data for time zone update
Switch to streaming data for time zone update rather than
loading it into memory first.
Also make sure that the ParcelFileDescriptor passed to the
service is closed in all cases.
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
Test: Manual
Bug:
31008728
Change-Id: Ia1e27b204697caee62deb2a3d682800350bca800
Neil Fuller [Thu, 22 Jun 2017 13:10:29 +0000 (14:10 +0100)]
Avoid use of TimeZoneDistro.equals() method
The TimeZoneDistro method is going away.
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
Test: Manual
Bug:
31008728
Change-Id: Id90cf7ce534b888bf6df1bf1dc9d497608dcdbe9
Sean Lu [Mon, 26 Jun 2017 10:19:28 +0000 (18:19 +0800)]
[Resources] house keeping in TypeList
Symptom: Type was freed but still may be access
Root Cause: TypeList not cleared
Solution: clear the TypeList
Project: AOSP
Note: None
Test: Yes
Change-Id: I00225165a30d15a299b7a483ea393b4447d2a3fc
Adam Vartanian [Mon, 26 Jun 2017 10:08:23 +0000 (10:08 +0000)]
Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp
Adam Vartanian [Mon, 26 Jun 2017 09:43:38 +0000 (10:43 +0100)]
Add libcrypto to shared libraries of core/jni
This was added to master in ag/
2447995 but not to aosp in aosp/420427,
which resulted in a failure in this branch.
Bug:
62991913
Test: make
Change-Id: Iefa0254c91e83da737a160f851c97ab3e6a7b0f8
Merged-In: I547bb838befa743d72d356c186ff3cd355736589
Paul Duffin [Mon, 26 Jun 2017 09:33:23 +0000 (09:33 +0000)]
Merge "Clean up TestCaseUtil" am:
43851d01d8
am:
e38d503394
Change-Id: I62a80b405d05ec7b4da050bd6b01df4c965d6187
Paul Duffin [Mon, 26 Jun 2017 09:24:39 +0000 (09:24 +0000)]
Merge "Clean up TestCaseUtil"
am:
43851d01d8
Change-Id: I5a56102b06053eb92583457105adf7e88bdb5502
Paul Duffin [Mon, 26 Jun 2017 09:15:05 +0000 (09:15 +0000)]
Merge "Clean up TestCaseUtil"
pkanwar [Wed, 31 May 2017 20:10:03 +0000 (13:10 -0700)]
Carrier Config changes to support IMSI encryption.
Adding 2 config parameters to CarrierConfigManager:
1. imsi_key_download_url.
2. imsi_key_expiration_days_time.
BUG:
35606429
Test: manual
Change-Id: I191dd0db5fa84a57faea88cb59c2c0b2604064b2
Hugo Benichi [Thu, 22 Jun 2017 06:19:35 +0000 (15:19 +0900)]
IpManager: always log immediate provisioning errors
And also migrate remaining Log.e usage to logError.
Bug:
62716267
Test: built and flashed
Change-Id: I61a6cec081d2bc0fe3d73e46fd52f1a42684e58c
Hugo Benichi [Sat, 24 Jun 2017 12:37:45 +0000 (12:37 +0000)]
Merge "Relax SharedLogTest asserts" am:
91464bfe68
am:
541079e0d7
Change-Id: I7a584c155915196c9b6b1a856141a3d9ab5699db
Hugo Benichi [Sat, 24 Jun 2017 12:29:28 +0000 (12:29 +0000)]
Merge "Relax SharedLogTest asserts"
am:
91464bfe68
Change-Id: Ibcf2ee24ac33a23fb3813dc6045db154644e1a3d
Hugo Benichi [Sat, 24 Jun 2017 12:19:55 +0000 (12:19 +0000)]
Merge "Relax SharedLogTest asserts"
Daniel Sandler [Sat, 24 Jun 2017 02:02:17 +0000 (02:02 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev
am:
7fce51594e
Change-Id: Ia84326f38bbd1154c9ee5a76c3952a9c5e0699f2
Daniel Sandler [Sat, 24 Jun 2017 01:50:34 +0000 (01:50 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev
Wale Ogunwale [Sat, 24 Jun 2017 01:35:49 +0000 (01:35 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
am:
0b138595de
Change-Id: I9cb5f092e253f06fc2abe4c90c9070ecf472125f
TreeHugger Robot [Sat, 24 Jun 2017 01:21:39 +0000 (01:21 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
Selim Cinek [Sat, 24 Jun 2017 00:55:48 +0000 (00:55 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
am:
9bf5c0c3e1
Change-Id: Ic93f722459de8da30b9b2f8971dfd0b650e37f10
Selim Cinek [Sat, 24 Jun 2017 00:44:08 +0000 (00:44 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
Hugo Benichi [Sat, 24 Jun 2017 00:40:48 +0000 (00:40 +0000)]
Merge changes I193297e0,I43beb966 am:
c729ff8253
am:
5dec1df23b -s ours
Change-Id: If036f9c7b4219a20ddb21d5aa1b7f3e3b29bee51
Selim Cinek [Sat, 24 Jun 2017 00:22:38 +0000 (17:22 -0700)]
Fixed an issue in the contrast calculation
The parameters were passed the wrong way around.
Test: manual inspection
Fixes:
62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
Hugo Benichi [Sat, 24 Jun 2017 00:13:24 +0000 (00:13 +0000)]
Merge changes I193297e0,I43beb966
am:
c729ff8253
Change-Id: Ie35f8cfe6ab77d0547f38b3bdcaf8f57832c0354
Hugo Benichi [Sat, 24 Jun 2017 00:01:22 +0000 (00:01 +0000)]
Merge changes I193297e0,I43beb966
* changes:
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
Connectivity metrics: serialize networkId, transports, ifname
Bryce Lee [Fri, 23 Jun 2017 23:53:45 +0000 (23:53 +0000)]
Merge "Add ActivityInfo logging." into oc-dev
am:
4b6219dab3
Change-Id: I01029ae8a05578e615683f326fe66df0b1e05bf8
Bryce Lee [Fri, 23 Jun 2017 23:45:15 +0000 (23:45 +0000)]
Merge "Add ActivityInfo logging." into oc-dev
Hall Liu [Tue, 20 Jun 2017 00:20:10 +0000 (17:20 -0700)]
Add download request tokens and enforce destination clear
Start writing tokens for each download request after calling download(),
and check agains them when a completed-file intent is received with a
download request extra.
Also start checking that the download destination is clear.
Change-Id: I533fe2ba49ac56bed5eab44670fe8e9a273b1ffb
Bryce Lee [Fri, 23 Jun 2017 21:53:02 +0000 (14:53 -0700)]
Add ActivityInfo logging.
This changelist adds additional logging around the ActivityInfo used
during startActivity to trace down when the userid changes.
Bug:
38121026
Test: manual
Change-Id: I162f4772845bc2cae585b7e4b027f3cce33439f4
Wale Ogunwale [Fri, 23 Jun 2017 21:52:40 +0000 (14:52 -0700)]
Fixed some rotation while unlocking screen issue.
- Don't use snapshot that is in different orientation than the current
display orientation. This is a follow up to a previous CL whose
implementation wasn't complete.
- Disabled fixed for unnecessary relaunches when unlocking with
fingerprint sensor introduced in ag/
2310557. This causes regression in
the experience from N. We still have the relaunches, but we cover up the
delay by displaying the apps starting window.
- Added more trace log points.
Fixes:
62796190
Fixes:
62904487
Bug:
38494778
Test: go/wm-smoke and manual verification of bug.
Change-Id: Id161a334cb4455dd9eb25c6bb63d5bb3f8a6f1f0
susnata [Fri, 23 Jun 2017 22:43:03 +0000 (22:43 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev
am:
c34dec82a9
Change-Id: Iec9bf203d787d5dcf585b8091bb32b20f1e09f37
TreeHugger Robot [Fri, 23 Jun 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev
yinxu [Fri, 23 Jun 2017 22:27:42 +0000 (15:27 -0700)]
Fix the inconsistency of scan status.
In types.hal and ril.h, the scan status is defined as:
PARTIAL = 0x01
COMPLETE = 0x02
But in NetworkScanResult.java, the scan status is defined as:
public static final int SCAN_STATUS_PARTIAL = 0
public static final int SCAN_STATUS_COMPLETE = 1
This CL makes changes to NetworkScanResult.java so that the scan status
is consistent both in Telephony and RIL.
Test: Telephony sanity tests
Bug:
30954762
Change-Id: Iadcd344ad3fe682da98a1a41c2964583f67dc792
Elliott Hughes [Fri, 23 Jun 2017 21:26:41 +0000 (21:26 +0000)]
Merge "Replace MallocHelper with std::unique_ptr." am:
8330d5212d
am:
6dfb0ca3d5
Change-Id: Ib4853eeb3e5524935780881a1758262d50ab8e29
TreeHugger Robot [Fri, 23 Jun 2017 21:21:33 +0000 (21:21 +0000)]
Merge "resolve merge conflicts of
2e21f8d8cbbe to oc-dev-plus-aosp" into oc-dev-plus-aosp
Lucas Dupin [Fri, 23 Jun 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
am:
9b73401191
Change-Id: Iad0f7b3ff9db9128e825b72040cc4c9123dde4c1
Lucas Dupin [Fri, 23 Jun 2017 19:11:11 +0000 (19:11 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
Robert Sloan [Fri, 23 Jun 2017 19:09:47 +0000 (12:09 -0700)]
resolve merge conflicts of
2e21f8d8cbbe to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c6e9a52e67a06c16b6c8fb6f8eb4647b2fec508
Elliott Hughes [Fri, 23 Jun 2017 18:00:09 +0000 (18:00 +0000)]
Merge "Replace MallocHelper with std::unique_ptr."
am:
8330d5212d
Change-Id: I6ec7b1ddd823b48f3033546416e6ffc81d24c03a