Fan Zhang
d4b35c7924
Merge "Add zhfan as owner of settings_enums.proto."
...
am: a313cab4dc
Change-Id: I3c73118c06e8ca9e0b41573dc27d86c814068ba9
2018-11-07 12:09:48 -08:00
Treehugger Robot
a313cab4dc
Merge "Add zhfan as owner of settings_enums.proto."
2018-11-07 19:46:22 +00:00
Eugene Susla
3b46002f1b
Merge "Add more OWNERS to DefaultPermissionGrantPolicy"
...
am: 6b0c47b2b8
Change-Id: I88cf381e33d08227d2312defe8a934f87b1bba47
2018-11-07 10:55:11 -08:00
Treehugger Robot
6b0c47b2b8
Merge "Add more OWNERS to DefaultPermissionGrantPolicy"
2018-11-07 18:37:12 +00:00
Alan Stokes
51b0de1c54
Merge "Fix test that was failing due to a cast error."
...
am: e5a8e89d86
Change-Id: I95d798a2c78dad57ed0d73151cc81d49b4e212af
2018-11-07 10:25:40 -08:00
Treehugger Robot
e5a8e89d86
Merge "Fix test that was failing due to a cast error."
2018-11-07 18:06:09 +00:00
David Brazdil
e515c95f6c
Merge "Add entries to hiddenapi light greylist"
...
am: c00b9bcf8d
Change-Id: Ia1245f61a5b80cbee1e2678daee551fd527c7f62
2018-11-07 09:14:06 -08:00
David Brazdil
c00b9bcf8d
Merge "Add entries to hiddenapi light greylist"
2018-11-07 16:55:59 +00:00
Alan Stokes
6e4ceb1e50
Fix test that was failing due to a cast error.
...
Bug: 113800711
Test: atest ActivityStackTests
Change-Id: I12c8ba8ecfbebe810a06ab0dc6306b69d5586c7b
Merged-In: Ic08609436b480c0e3f493e2790398344d3122031
2018-11-07 16:38:59 +00:00
David Brazdil
72c3f3ffd5
Add entries to hiddenapi light greylist
...
These are entries from P accidental whitelist which have been found
in use by static/dynamic analysis.
Test: m appcompat
Change-Id: Ifa269c8ba42d807e6bbe37d5122143921d00ec22
Merged-In: I473d2bc8a9b527cccdb103d527ce7613f4a6ac85
2018-11-07 14:41:41 +00:00
Tyler Gunn
226c56a6be
Merge "Add disconnect cause when outgoing call fails due to ongoing OTASP prov."
...
am: 009b2dd158
Change-Id: Ic1f54bf78a95f85032e028957d50a30ef984b48c
2018-11-06 16:37:50 -08:00
Eugene Susla
12e52e8ab8
Add more OWNERS to DefaultPermissionGrantPolicy
...
All changes to DPGP are required by gerrit to be reviewed by one of the owners
Some of the changes are simple enough that the blocks this causes is
not worth it
This change must be submitted through aosp
Test: test later in gerrit
Change-Id: I8d066a403376c7e620664abda1dbb71d9c87bb04
2018-11-06 16:30:30 -08:00
Alex Light
7901714521
Merge "Correct illegal mockito usage."
...
am: 5bb1e8c9bc
Change-Id: Ib8c6436b72d0cbb7133a9a2b0586f8263adf598e
2018-11-06 15:44:46 -08:00
Tyler Gunn
009b2dd158
Merge "Add disconnect cause when outgoing call fails due to ongoing OTASP prov."
2018-11-06 23:32:05 +00:00
Alex Light
5bb1e8c9bc
Merge "Correct illegal mockito usage."
2018-11-06 23:28:15 +00:00
Brad Ebinger
f40eeb4a18
Merge "Expose mRestrictCause as a @SystemApi"
...
am: 37d8de2b2a
Change-Id: I6385af068774745f675d6c6568b883e75a813034
2018-11-06 15:11:47 -08:00
Brad Ebinger
37d8de2b2a
Merge "Expose mRestrictCause as a @SystemApi"
2018-11-06 22:54:10 +00:00
Alex Light
84faaf8ec6
Correct illegal mockito usage.
...
According to the mockito FAQ use of thenReturn(mock(...)) is
forbidden. This fixes that pattern in the setup for
ZenModeFilteringTest.
https://github.com/mockito/mockito/wiki/FAQ#can-i-thenreturn-an-inlined-mock-
Test: runtest systemui-notification
Bug: 119063276
Change-Id: Ic62b18063e5837240255e1dd0f5e0feb450f22cb
2018-11-06 14:15:54 -08:00
Colin Cross
3e312d20cd
Merge changes from topic "revert-protobuf3.5.2"
...
am: a4680e1ebe
Change-Id: Iae43445ebe8f2c3a702e69c75b5444c81d68dc61
2018-11-06 11:03:10 -08:00
Colin Cross
65200cf70e
Revert "Convert statsd_test and statsd_benchmark to proto lite"
...
am: 47046b80d2
Change-Id: I7b00b3ddfe15978058ea5ae6979f8c382d488292
2018-11-06 10:56:40 -08:00
Colin Cross
a4680e1ebe
Merge changes from topic "revert-protobuf3.5.2"
...
* changes:
Revert "Adapt to google::protobuf::uint64 type change"
Revert "Convert statsd_test and statsd_benchmark to proto lite"
2018-11-06 18:42:03 +00:00
Jack Yu
56ce3a6f41
Merge "Added APN to string method"
...
am: 3bedd0a674
Change-Id: Ifd75ed08c0edabd228af3a5b654fb499afff2ef2
2018-11-06 10:38:46 -08:00
Jack Yu
3bedd0a674
Merge "Added APN to string method"
2018-11-06 18:19:31 +00:00
Tadashi G. Takaoka
cfbbe2d89d
Merge "Fix missing showWhenLocked activity attribute"
...
am: f1e9db0cbe
Change-Id: If921e3c02dc5c3604f4c67c77666f85cefd69846
2018-11-06 09:06:46 -08:00
Tadashi G. Takaoka
f1e9db0cbe
Merge "Fix missing showWhenLocked activity attribute"
2018-11-06 16:57:36 +00:00
Alan Stokes
ad370ddf38
Merge "Stop recording unsupported class loaders."
...
am: c90f30d1d9
Change-Id: Ie89804c75a652608481e70bcf27b95ced43a578c
2018-11-06 01:21:42 -08:00
Alan Stokes
c90f30d1d9
Merge "Stop recording unsupported class loaders."
2018-11-06 08:58:59 +00:00
Tadashi G. Takaoka
0b590e6ab9
Fix missing showWhenLocked activity attribute
...
This attribute will stabilize ScreenDecorWindowTests since this test
needs activity is shown even on locked device.
Fixes: 119041502
Bug: 119037340
Test: On sleeping DUT.
atest FrameworksServicesTests:com.android.server.wm.ScreenDecorWindowTests
Change-Id: I98ef00ba32c792c396f3abba447dd20628902492
Merged-In: I8fc2683ad65e627c4e002b767fd23a4dd9f16223
2018-11-06 13:40:49 +09:00
Fabrício Ferracioli
632e04221d
Merge "Adding 1662 for Netherlands in the SMS shortcode whitelist."
...
am: fa1536d33d
Change-Id: Ie24b0ac85d58cc2ae64e5ced0e7041cbcfc8ecb7
2018-11-05 19:45:24 -08:00
Treehugger Robot
fa1536d33d
Merge "Adding 1662 for Netherlands in the SMS shortcode whitelist."
2018-11-06 03:34:33 +00:00
Shuo Qian
aea5d0afcc
Merge "Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)""
...
am: 1a517ba852
Change-Id: I72cc7a0f3c566820f674333b312ffec740281c4e
2018-11-05 19:17:33 -08:00
Shuo Qian
1a517ba852
Merge "Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)""
2018-11-06 03:06:20 +00:00
Shuo Qian
5e80484991
Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)"
...
This reverts commit c3380f767a .
Reason for revert: b/119055885
Change-Id: I47e6dd038d97a9d5a48d36b53f9e75e356a1e409
2018-11-06 00:18:16 +00:00
Jack Yu
24d9490c48
Added APN to string method
...
There were some limitation of the existing method
ApnSetting.getApnTypesBitmaskFromString, which prints
hipri+default when input is default APN type.
Also added access network type and transport type to string
method.
Test: Telephony sanity tests
Bug: 73659459
Change-Id: I5a24ac4b284c9237f84c8b1a6961569c4f0a747a
2018-11-05 14:37:23 -08:00
Brad Ebinger
f5544c3e92
Expose mRestrictCause as a @SystemApi
...
Bug: 117555643
Test: Telephony unit tests
Change-Id: I60a7028d79f7e5fa676cc12a427c6d2a8cd3961e
2018-11-05 10:33:00 -08:00
Evan Laird
509e8969a2
Merge "SystemUI: Add tuner interface to StatusBarSignalPolicy"
...
am: 3ef1990e7c
Change-Id: Ibeb326519b67b7f076ca01c21756f92c425efeb0
2018-11-05 10:11:21 -08:00
Evan Laird
3ef1990e7c
Merge "SystemUI: Add tuner interface to StatusBarSignalPolicy"
2018-11-05 17:57:44 +00:00
Paul Duffin
455c3da3e2
Merge "Remove sun.... libcore classes from light grey/vendor lists"
...
am: 65b79f96cd
Change-Id: I060ab0a9dfff6bbf0c04cd7b15bca9250d7c776e
2018-11-05 06:03:31 -08:00
Treehugger Robot
65b79f96cd
Merge "Remove sun.... libcore classes from light grey/vendor lists"
2018-11-05 13:46:02 +00:00
Fabrício Ferracioli
9e40d1a047
Adding 1662 for Netherlands in the SMS shortcode whitelist.
...
Added 1662 for Netherlands in Q3 SMS shortcode whitelist.
Test: Tests performed by Salvatore Baglieri.
BUG: 111393528
Change-Id: I406c6c7260f5bce365b3f116df8ef2045c9ba3fa
Signed-off-by: Fabrício Ferracioli <fferracioli@google.com >
2018-11-05 11:35:15 -02:00
Alan Stokes
6dba50d633
Stop recording unsupported class loaders.
...
Don't record anything if any of the classloaders in the chain are
unsupported. (This is slightly unsubtle, but matchs the existing
behavior - see below.) We can't correctly DexOpt secondary dex files
in this case anyway.
Also discard any existing records of unsupported classloaders on read.
Currently this is almost a no-op: BaseDexClassLoader doesn't notify if
there are any unknown class loaders, since
5ac512c07cfa80160e240c359349c1390a20a981, so the new check is
reachable only if there's some sort of mismatch. But I'm going to
change that soon.
Tightened up visibility a bit too.
Bug: 111336847
Test: atest --test-mapping services/core/java/com/android/server/pm/dex
Change-Id: I6af5620a73be7b6440cbafdf6a5c1da1082cbdd4
2018-11-05 11:13:46 +00:00
Tony Zhu
21457121f4
Merge "[Call Screening]Programmatically changing the default call screening app."
...
am: 6dd64df8b3
Change-Id: Iaf1d79f340f57a62fe7089d094107906869383fd
2018-11-05 02:48:50 -08:00
Tony Zhu
6dd64df8b3
Merge "[Call Screening]Programmatically changing the default call screening app."
2018-11-05 10:35:27 +00:00
Junyu Lai
7a782be65d
Merge "Extend onDnsEvent callback to report more fields."
...
am: 89eb3e6117
Change-Id: I9051489d16dd720eab9fa3a0c4d4a2c6ae07e7bd
2018-11-04 20:44:30 -08:00
Junyu Lai
89eb3e6117
Merge "Extend onDnsEvent callback to report more fields."
2018-11-05 04:29:47 +00:00
Colin Cross
11a4d77516
Merge changes from topic "protobuf3.5.2"
...
am: 1d899f6be8
Change-Id: Ia235da2303ae0622bc8826fe9ac035fae894aec1
2018-11-04 17:51:56 -08:00
Colin Cross
5742f9ffa7
Convert statsd_test and statsd_benchmark to proto lite
...
am: e7908d7b62
Change-Id: Id43ecd7edc87c7e58dc194b7adbf8b48c70b5fc0
2018-11-04 17:45:26 -08:00
Colin Cross
054b0c0e06
Revert "Adapt to google::protobuf::uint64 type change"
...
This reverts commit fa6bc27df0 .
Change-Id: I9f778e6daa9ae0c6080016ab0bd1e6e414ae6061
2018-11-04 17:24:27 -08:00
Colin Cross
47046b80d2
Revert "Convert statsd_test and statsd_benchmark to proto lite"
...
This reverts commit e7908d7b62 .
Change-Id: I585991ab1d5b35930bee6e32b82714aa11fbcb41
2018-11-04 17:24:26 -08:00
Colin Cross
1d899f6be8
Merge changes from topic "protobuf3.5.2"
...
* changes:
Adapt to google::protobuf::uint64 type change
Convert statsd_test and statsd_benchmark to proto lite
2018-11-05 01:13:15 +00:00