Commit Graph

91460 Commits

Author SHA1 Message Date
Kevin Chyn
ecc07726e2 Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
am: a74fbef8ce

Change-Id: Ib14cc5a35991dec3623ecf2dfdb72cbbccd7e53e
2018-06-15 22:49:30 -07:00
TreeHugger Robot
a74fbef8ce Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev 2018-06-16 00:28:17 +00:00
Philip P. Moltmann
53427b7237 Merge "Abbreviate permission labels less aggressively" into pi-dev
am: af76df93e3

Change-Id: I61a45dd4489c930f2c5b3fbcf6f7632771d6f18e
2018-06-15 10:48:34 -07:00
Philip P. Moltmann
af76df93e3 Merge "Abbreviate permission labels less aggressively" into pi-dev 2018-06-15 17:18:52 +00:00
Bernie Innocenti
3e0f3ef8ad Merge "Make dumpHexString() tolerate null arrays." am: a917c1db32
am: 7bb253d078

Change-Id: Id58b8039510baa518d8d10b03237681a7b842d0f
2018-06-14 22:02:58 -07:00
Bernie Innocenti
7bb253d078 Merge "Make dumpHexString() tolerate null arrays."
am: a917c1db32

Change-Id: Ib0160e232cab0a713853a65eef26f7a02d65c1f1
2018-06-14 21:55:53 -07:00
Tony Huang
cb74f9c13d Fix solid circle show on message notification
am: 1250cd1407

Change-Id: I9742ab1f93c797e23d4545d6659efcfa4808b03c
2018-06-14 20:13:32 -07:00
Tony Huang
1250cd1407 Fix solid circle show on message notification
Message app or other apps will use some format code or controll
code on SenderName to fit RTL or other design, and symbols will
produced by these code. The special code pattern not include these
code, so it will go charIcon flow.
Although these code is not visible, we should just ignore them to
get symbol strings

Change-Id: I20ef459b10ba7504ec0c997ed815cb485817d2bc
Fixes: 109746235
Test: Check notification form message app on RTL
Test: atest SystemUITests
2018-06-15 02:59:57 +00:00
Treehugger Robot
a917c1db32 Merge "Make dumpHexString() tolerate null arrays." 2018-06-15 02:32:54 +00:00
Philip P. Moltmann
004e489a25 Abbreviate permission labels less aggressively
We switched the package installer app to always abbreviate all labels
loaded from foreign packages. This is done so that a foreign app cannot
crorrupt the UI via super-long strings.

The default abbreviation is very aggressive and abbreviates to ~5 cm.

When an app with a targetSDK <= M gets installed, all permissions will
get auto-granted. Hence when a user side-loads such an app, we show the
permissions during install so that the user is aware of this.

Unfortunately most permission labels and restrictions do not fit into a
single line.

This change allows much longer strings for permissions names and
descriptions. It still abbreviates eventually and handles permission
descriptions with weird characters (such as back-space) correctly.

Fixes: 110209410
Test: Side-loaded old app and verified that permission labels and
      descriptions are not abbreviated.

Change-Id: Ie1db240883c9f5cb9c1b74ca7bdcb80625e3f7f2
2018-06-14 11:52:14 -07:00
Bernie Innocenti
dee4e0bde4 Make dumpHexString() tolerate null arrays.
Rationale: hexdumps are mainly used when verbose logging is enabled,
which means that callers are rarely exercised (let alone tested).
Crashing on unchecked null pointers doesn't make debugging any easier,
nor production code any more robust.

Moreover, this is the behavior of system.out.println() and other
logging APIs.

Test: runtest -x core/tests/coretests/src/com/android/internal/util/HexDumpTest.java
Bug: 110177912
Change-Id: Idccd81a5654ed0f7fee6b27177941bf8c311973e
2018-06-14 22:59:08 +09:00
Neil Fuller
252382bede Merge "Add TimestampedValue.toString()" am: bfa58946f7
am: 494665870f

Change-Id: Iedd2ce7207cb8c74e9a109e8cdb6c687f45072ec
2018-06-14 02:49:13 -07:00
Neil Fuller
494665870f Merge "Add TimestampedValue.toString()"
am: bfa58946f7

Change-Id: I38760ef47ba04f20882a467857e7c57c088d4391
2018-06-14 02:40:17 -07:00
Lucas Dupin
89cdaab2ab Merge "Config to enable/disable AOD via overlay" into pi-dev
am: b784e6f7bc

Change-Id: I7e6d629b9ca6e87a48c332dab470771c4564985d
2018-06-13 18:30:24 -07:00
Lucas Dupin
b784e6f7bc Merge "Config to enable/disable AOD via overlay" into pi-dev 2018-06-14 01:16:44 +00:00
Lucas Dupin
1e02f340e0 Config to enable/disable AOD via overlay
Bug: 109894567
Test: mp droid; fastboot -w
Change-Id: I3fda0bf486ae0c4b795ce34ba6823d8dc36a3796
2018-06-13 15:36:04 -07:00
Robin Lee
255c3b664d Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" into pi-dev
am: 82614bed0b

Change-Id: Iae08aea13f79273e6f47d3c32832cd4eddd51010
2018-06-13 14:40:21 -07:00
Evan Laird
f63718533f Merge "Use disableForUser in StatusBarManager" am: 5392d799ab
am: 3f3aa3518f

Change-Id: Ieb7bf7cc8d9fc54b56ec5f8d5caa723357c8ec6e
2018-06-13 09:09:03 -07:00
Evan Laird
3f3aa3518f Merge "Use disableForUser in StatusBarManager"
am: 5392d799ab

Change-Id: I346f8a17d43e65c6e9ed362942345146ad6cac1d
2018-06-13 08:56:41 -07:00
Neil Fuller
1ecf4ac212 Fix a syntax error in SystemServiceRegistry
The syntax error was introduced by a bad conflict resolution
in http://ag/4324946.

Bug: 110097023
Test: Inspection only
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I546f2d010faa6f75033cf7e3e51ef7ed640854ed
(cherry picked from commit 10e276a24d)
2018-06-13 14:50:34 +00:00
Neil Fuller
ca97b34330 Add TimestampedValue.toString()
To make debug logging useful.

Bug: 78217059
Test: Build
Change-Id: I710b56d189afeb26ac50f55d9286d04219779ee7
2018-06-13 15:29:05 +01:00
Robin Lee
a6b5344bd3 Do not treat EXTRA_SMALL_ICON <int> as Parcelable
It isn't one, and I should have read the documentation on it properly
before treating it the same as EXTRA_LARGE_ICON (which is indeed a
Parcelable).

This fixes a chronic outpouring of technically-probably-harmless warning
stack traces of the following nature which can be verified by running
the framework tests and grepping logcat for this scary-looking string:

  java.lang.ClassCastException: java.lang.Integer cannot be cast to
  android.os.Parcelable
    at android.os.Bundle.getParcelable(Bundle.java:***)
    at android.app.Notification.fixDuplicateExtra
    at android.app.Notification.fixDuplicateExtras
    at android.app.Notification.readFromParcelImpl

Duplicate Integer objects are harmless compared to the Bitmap so there
is zero sense in recombining the objects after an RPC. We just drop the
line which tries to do that.

Test: make FrameworksCoreTests -j30 && \
Test: adb install -r ${ANDROID_PRODUCT_OUT}/data/app/*/FrameworksCoreTests.apk && \
Test: adb shell am instrument \
Test:   -e class android.app.NotificationTest \
Test:   -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I2c88ab4e9d5322c05e2e7f68df85ed5b2f296f84
Fix: 79404137
(cherry picked from commit 62eea67846)
2018-06-13 06:11:37 +00:00
Pengquan Meng
1969c54ae2 Merge "Remove internal ApnSetting." into pi-dev-plus-aosp 2018-06-12 21:38:22 +00:00
Neil Fuller
10e276a24d Fix a syntax error in SystemServiceRegistry
The syntax error was introduced by a bad conflict resolution
in http://ag/4324946.

Bug: 110097023
Test: Inspection only
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I546f2d010faa6f75033cf7e3e51ef7ed640854ed
2018-06-12 20:20:27 +01:00
Evan Laird
172708b539 Use disableForUser in StatusBarManager
If a secondary user is added to the device and in the middle of SUW, the
SUW process can be killed via ADB. This will cause the process to get
restarted and call StatusBarManager#disable()/disable2(), which uses the
StatusBarManagerService methods that use the current uid.

The fix is to use Binder.getCallingUserHandle() in StatusBarManager so that the
SUW from another user can't affect the current user unless it is
current.

Test: start SUW from new user, cancel set up and go back to primary
user. Kill the SUW process. Nav bars remain un-hidden

Change-Id: Ie6f648827d8d384ae87f74e2d746b7566a7b9011
Fixes: 78360699
2018-06-12 15:14:25 -04:00
Treehugger Robot
16eef1aad8 Merge "Frameworks: Remove complex boolean" 2018-06-12 19:24:19 +00:00
Neil Fuller
a3aa3221bf Merge "Simple pass-through TimeDetectorService" am: cb749e2e50
am: 415585f2a5

Change-Id: Id0259be3d9ad4e869c5e96cb166b8654d52c1ad7
2018-06-12 11:26:56 -07:00
Neil Fuller
415585f2a5 Merge "Simple pass-through TimeDetectorService"
am: cb749e2e50

Change-Id: Ic2e3d3c3f9181ef4054f599baf4ac086ec21d8bd
2018-06-12 11:17:51 -07:00
Andreas Gampe
eb56c581d3 Frameworks: Remove complex boolean
To allow an Errorprone warning to become an error.

Bug: 72451126
Test: m
Change-Id: I8733f0ee74de615e4ffc979fb9de38730c2506c6
Merged-In: Ia6856157e8813856268fba003e1e591d690cb26e
2018-06-12 10:37:04 -07:00
Treehugger Robot
cb749e2e50 Merge "Simple pass-through TimeDetectorService" 2018-06-12 17:01:25 +00:00
Neil Fuller
4773b9dadc Simple pass-through TimeDetectorService
This is sufficient to wire up time detection from telephony
to the new service without breaking time detection.

This cherry-pick contains a small change: to use
SystemClock.elapsedRealtime() instead of the newer
SystemClock.elapsedRealtimeClock() with Clock.millis().

Bug: 78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Merged-In: Id7175878dc22e5272c31f3e478af4b0e4183b62b
Change-Id: Id7175878dc22e5272c31f3e478af4b0e4183b62b
(cherry picked from commit 24836bfb15)
2018-06-12 15:33:35 +01:00
Chalard Jean
d118c2b444 Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ... am: 6c0106b57f
am: 85bae863f5

Change-Id: Ica8e290909a34976e00bebbb622dd49d8f0d6b8d
2018-06-12 07:04:45 -07:00
Chalard Jean
85bae863f5 Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
am: 6c0106b57f

Change-Id: I86bc83e2bd859b48017f12832e9ff0080ec162b8
2018-06-12 06:57:33 -07:00
yuemingw
9bf808cce1 Remove internal ApnSetting.
Bug: 77511388
Test: atest FrameworksTelephonyTests
Change-Id: I9757ef4aae269d828c98a7363c98629c9be74846
2018-06-12 13:56:28 +00:00
Neil Fuller
267ef30c8b resolve merge conflicts of 5e1d95b0cc to stage-aosp-master
am: 79d42a61e4

Change-Id: I8dcebef6e996dfaec01934552aa0f3d6f8c9053a
2018-06-12 06:36:14 -07:00
Neil Fuller
79d42a61e4 resolve merge conflicts of 5e1d95b0cc to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790
2018-06-12 14:23:51 +01:00
Chalard Jean
6c0106b57f Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
* changes:
  [PT06] Move setGlobalProxy into ProxyTracker
  [PT05] Move sendProxyBroadcast into ProxyTracker.
  [PT04] Move PacManager into ProxyTracker.
  [PT03] Move some more code into ProxyTracker.
  [PT02] Move static methods to ProxyTracker
  [PT01] Introduce ProxyTracker
  Remove a useless parameter.
  Small cleanup of Network.
  Cleanup of LinkProperties.
2018-06-12 12:23:59 +00:00
Chalard Jean
6823744fa6 Small cleanup of Network.
Test: runtest
Change-Id: I56dbd37bb8f890938d360f45835de72be4beb91a
2018-06-12 19:03:14 +09:00
Chalard Jean
b8cfa1d0eb Cleanup of LinkProperties.
Test: runtest
Change-Id: I7299de93a79901635ce755a2d933666ee43767d5
2018-06-12 19:03:07 +09:00
Neil Fuller
5e1d95b0cc Merge "Minimum viable TimeDetectorService" 2018-06-12 09:50:32 +00:00
Kevin Chyn
6df6b027f0 Don't back up Assist Gesture setup/sensitivity
Fixes: 72715022

Test: With two devices, set up one, back up onto the other.
      SUW for Assist Gesture does not get skipped
Test: atest SettingsBackupTest

Change-Id: Id7348542a618c0366f89c47833af6f66bf52b18f
2018-06-11 16:13:00 -07:00
Jakub Pawlowski
00f135d1be Merge "ScanRecord.getServiceData NPE fix" am: d62f74e806
am: 8d0eb01843

Change-Id: I9a7e94cb51f724da7d089fbe027a06d36ad5ebb4
2018-06-11 09:16:39 -07:00
Jakub Pawlowski
8d0eb01843 Merge "ScanRecord.getServiceData NPE fix"
am: d62f74e806

Change-Id: I11a254cf633dc5cf9a7c53c992bf49b00f3d274e
2018-06-11 09:07:31 -07:00
Jakub Pawlowski
59880123d7 ScanRecord.getServiceData NPE fix
Bug: 109662587
Change-Id: I0e9653d9cd7e4b748870bacb6fbcecae535ebb2a
2018-06-11 14:43:42 +00:00
Neil Fuller
b557907f51 Minimum viable TimeDetectorService
This is a do-nothing TimeDetectorService that can be
populated in following commits. A temporary method has been
added so the service has one method.

Unit tests can be run with:

atest FrameworksServicesTests:TimeDetectorServiceTest

Test: build / boot
Test: See above
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
(cherry picked from commit feeee682a2)
2018-06-11 15:29:57 +01:00
Chalard Jean
3ef3fae232 Merge changes Ifd7d73ad,Id79096fa am: bfe3b1a691
am: 9f0df265ba

Change-Id: Ibce24e5d55e728a1a08f534fa91b3be0bbc3b990
2018-06-11 07:16:08 -07:00
Chalard Jean
9f0df265ba Merge changes Ifd7d73ad,Id79096fa
am: bfe3b1a691

Change-Id: I263f51ba2aafdf8e19e020b2a4f6ff1b8238fa3c
2018-06-11 06:12:34 -07:00
Chalard Jean
faaf2fe700 Bugfixes in LinkProperties#toString
We should stop trying to use a human brain to write code

Test: manual
Change-Id: Ifd7d73ad65de0f671466080beacbd97287e17bfe
2018-06-11 18:48:37 +09:00
Chalard Jean
4d660114dc Cleanup of ConnectivityManager.
This is not exhaustive, but still an undeniable improvement.

Test: runtest frameworks-net
Change-Id: Id79096faf20eec80de7c17b261ef338b895af1e0
2018-06-11 18:48:37 +09:00
Ryo Hashimoto
5b6ba779fe Merge "Use ParcelFileDescriptor's C++ implementation in libbinder" am: 20e243d627
am: 9e2177b492

Change-Id: Ica2a4ef98eba9a5360398b6d5a05f141e0bb6f93
2018-06-11 02:29:56 -07:00