374057 Commits

Author SHA1 Message Date
Gopal Krishna Shukla
9117037dd3 Avoid onServiceDisconnected() for unbind Service
onServiceDisconnected() and unbindLocked() both
are responsible to make mRemoteInstanceas null,
so ensure that the service is not unbinded already
while calling onServiceDisconnected()

Fixes:111631529
Test: Build Successful and device Running.
Change-Id: I505d97e32c4e76f06a358850e91fe189bf02654c
2018-07-23 15:44:28 +00:00
Paul Duffin
a9c136b43e Deprecate InflaterInputStream.closed field
As recommended by the Android API Council this field is being
deprecated and will be removed from the API in a future release.

Bug: 111592689
Test: make checkbuild

Change-Id: I9aab7396b8b9faadb764fe9d43e80747b3eec018
2018-07-23 16:04:15 +01:00
Paul Duffin
8a20b7b6c6 Correct ordering of TelephonyManager methods
A previous change (db6a391957f51c6ed9a768f0c39c61ff7a4f3603) seems to
have added some new methods to the api/current.txt manually as they are
in the wrong order. This change corrects the ordering so that they do
not affect future changes to the api/current.txt file.

Bug: 74613795
Test: make checkbuild
Change-Id: I83f9c2ff3cd9f43add297e1c9411598f3eef094f
2018-07-23 16:03:44 +01:00
Neil Fuller
a84056a3d0 Break some dependencies on libcore internals
This commit swaps some internal details of libcore for some
abstractions on dedicated "internal facing" APIs. This reduces the
number of internal APIs used. There is an associated change in
libcore/

Bug: 111055375
Test: build / boot
Change-Id: Idddada1922701bd15475c840eaa76c505e545d33
2018-07-23 16:02:00 +01:00
Paul Duffin
96a1368158 Remove dependency on InflaterInputStream.closed field.
In upstream OpenJDK the InflaterInputStream.closed field is private.
During integration of OpenJDK into Android it was changed to be
protected so that it could be used by StrictJarFile, and in the process
was accidentally made part of the public API. This change removes the
StrictJarFile dependency on that field.

Bug: 111061052
Test: checkbuild, flash and run FrameworkCoreTests
Change-Id: I8aee1c444cf27e7078b848c65e0433c831ab06a0
2018-07-23 15:55:33 +01:00
Mathew Inwood
6395690ec9 Add new "class2greylist" tool.
This extracts signatures of methods that have the @UsedByApps annotation
for generating the greylist. It will be integrated into the build to
replace many members on greylist.txt.

Test: $ atest class2greylisttest
Bug: 110868826
Change-Id: Ifaf5859b60076c051de6be5a912ef70734330ce7
2018-07-23 14:39:19 +01:00
Olivier Gaillard
c142f686c5 Merge "Enable the generate transaction name for system server."
am: 3e3a6e4760

Change-Id: I0d54112c689aeaf83c4bc108af0a303e2850e85a
2018-07-23 05:07:33 -07:00
Olivier Gaillard
3e3a6e4760 Merge "Enable the generate transaction name for system server." 2018-07-23 10:32:49 +00:00
Olivier Gaillard
b19219207c Enable the generate transaction name for system server.
Size of vdex,art,oat files (flag off -> on)
- framework/boot*.vdex: +10K  (3.589M -> 3.599M)
- framework/arm64/boot*.{art,oat}: +20K  (4.378M -> 4.398M)

Test: manual
Change-Id: I4938ca5459004494a50ec81db9ef9e0f0e6e7a60
2018-07-23 10:15:54 +00:00
Martijn Coenen
f7e8f096d5 Make BinderProxy @hide public class.
To make some future refactoring easier.

Added some JavaDoc (mostly links to android.os.IBinder)
to make checkstyle happy.

Test: builds
Merged-In: If9dd6913868a34ea1e3d14fee1860a4ff368e06b
Change-Id: If9dd6913868a34ea1e3d14fee1860a4ff368e06b
(cherry picked from commit 03e6d923c579ec79939944e7a9a8ac1b36aa2bbb)
2018-07-22 15:04:08 +09:00
Josh Gao
1fad55e868 Merge changes from topic "bionic_fdsan_java"
am: bb352287c9

Change-Id: Ib6c5ac9ffc7f9aa88749af1c0d66880a1c98a650
2018-07-20 21:14:33 -07:00
Treehugger Robot
bb352287c9 Merge changes from topic "bionic_fdsan_java"
* changes:
  ParcelFileDescriptor: support bionic's fd ownership tracking.
  Reenable fdsan in the zygote post-fork.
2018-07-21 02:06:06 +00:00
Josh Gao
5ada87388c ParcelFileDescriptor: support bionic's fd ownership tracking.
Also, delete a bunch of deprecated functions that are package-private,
and not called anywhere in the package.

Test: booted walleye
Change-Id: I728e63e7d6f9e1ba42644f93983cfcd6a2d2634c
2018-07-20 16:00:20 -07:00
Josh Gao
d795110255 Reenable fdsan in the zygote post-fork.
By default, fdsan is disabled after forking to avoid breaking 'fork();
close(0..1024); exec(...)'. Reenable it in the zygote manually.

Bug: http://b/110100358
Test: booted walleye-aosp
Change-Id: I8706e4153e4e91306f50d215a62fe02d445082e1
2018-07-20 16:00:17 -07:00
Meng Wang
dab961a1c8 Merge "Correct Telus gid"
am: 198c084e32

Change-Id: I0e8aa238d0469f00b196cf8b87442b72af744513
2018-07-20 11:43:20 -07:00
Treehugger Robot
198c084e32 Merge "Correct Telus gid" 2018-07-20 17:23:11 +00:00
Jeff Vander Stoep
98df1b8ef2 Check for /dev/memcg/system/tasks before writing to it
Fixes the following errors in the logs on devices without /dev/memcg
mounted:

09-08 10:07:22.991   732   732 E Zygote  : couldn't write 1124 to
/dev/memcg/system/tasks
09-08 10:07:22.986   732   732 W main    : type=1400 audit(0.0:8):
avc: denied { create } for name="tasks" scontext=u:r:zygote:s0
tcontext=u:object_r:cgroup:s0 tclass=file permissive=0

Bug: 67860826
Test: boot Taimen, no more error/denial in the logs.
Change-Id: I37f481fa4e9e9116688cca4f090aa26f96f602c9
Merged-In: I37f481fa4e9e9116688cca4f090aa26f96f602c9
(cherry picked from commit 6bdc3a28e75bdb936e7c172bc8d305b2c30c9f06)
2018-07-20 17:12:53 +00:00
Tobias Thierer
597eb7f87e Merge "Use StrictJarManifest.ATTRIBUTE_NAME_NAME instead of Attributes.Name.NAME."
am: 2dc5a42743

Change-Id: I5a61fe6e4b9507a754f8977225bc4dbbee88a4ff
2018-07-20 10:11:27 -07:00
Treehugger Robot
2dc5a42743 Merge "Use StrictJarManifest.ATTRIBUTE_NAME_NAME instead of Attributes.Name.NAME." 2018-07-20 15:50:59 +00:00
Edward Savage-Jones
2de74edd83 Merge "Fix an incorrect null check"
am: 09071b4fa8

Change-Id: Ie69056c21ee03e397881c14ef69804fead2202a9
2018-07-20 08:00:25 -07:00
Treehugger Robot
09071b4fa8 Merge "Fix an incorrect null check" 2018-07-20 12:41:17 +00:00
Meng Wang
0e4f856ef9 Correct Telus gid
Bug: 34036790
Test: static code review
Change-Id: I3f81c98919425c35471d0bfcf88d77eb88895d12
2018-07-19 16:35:29 -07:00
Brad Ebinger
24edc2bc42 Quick style fixup of ISmsImplBase
Test: Compiles
Change-Id: Ic27db060e402d8a3239fe588a229c246c3228184
2018-07-19 16:17:31 -07:00
Jinguang Dong
3034085dff Merge "Ensure dropbox could copy tombstone files to special folder."
am: 12cdea59d3

Change-Id: I8b7f1b2d07629af4cc0008679cd8daf7d1e0464f
2018-07-19 15:52:33 -07:00
Nathan Harold
7b3f7a44af Access Identity and SignalStrength from CellInfo
Accessing common CellIdentity and CellSignalStrength
information should not require RTTI. Thus, add
overloaded methods that allow the access the common
versions of these functions from a top level CellInfo.

Bug: 10151416
Test: compilation

Change-Id: I18f31c5cec075dcd68cc493e24c2d551138dd73c
2018-07-19 15:24:14 -07:00
Treehugger Robot
12cdea59d3 Merge "Ensure dropbox could copy tombstone files to special folder." 2018-07-19 21:10:43 +00:00
Andreas Gampe
b32933c3cc Merge "Frameworks: Let GuardedBy accept multiple locks"
am: 940a9e95df

Change-Id: Ic74f0c274873d4573bb2ae9a38e91d43df79280d
2018-07-19 11:38:07 -07:00
Treehugger Robot
940a9e95df Merge "Frameworks: Let GuardedBy accept multiple locks" 2018-07-19 17:29:03 +00:00
Jinguang Dong
fe8d2c9a8c Ensure dropbox could copy tombstone files to special folder.
Process of tombstoned have changed the generation flow for
tombstone, and dropbox could not be notified when generating new
tombstone file any more, so dropbox could not copy and compress
tombstone file to /data/system/dropbox. We need to modify
observer events from CLOSE_WRITE to CREATE, and it could
work normally.

Bug: http://b/111608961
Test: 1 After tombstone is triggered, we could see the tombstone
      file in the data/system/dropbox directory.

Signed-off-by: Haoran Li <lihaoran5@huawei.com>

Change-Id: I9d6a31773e4a58658ffab214b1e337f27e9f3ae6
2018-07-19 17:01:53 +00:00
Neil Fuller
ec99ee195c Merge "Use Base64 from android.util in LocalTransport"
am: 8b9f98536e

Change-Id: I8178aea431b41a521346fd40a81ae79a253e5554
2018-07-19 09:58:06 -07:00
Neil Fuller
8b9f98536e Merge "Use Base64 from android.util in LocalTransport" 2018-07-19 15:38:37 +00:00
Andreas Gampe
7e9236873c Frameworks: Let GuardedBy accept multiple locks
Widen the definition to take advantage of errorprone support.

Bug: 72666911
Test: m
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Id792ee70b41b786da717f916e143786fe6308937
2018-07-19 08:12:43 -07:00
Edward Savage-Jones
36a8942ca2 Fix an incorrect null check
Found an incorrect null check when debugging.

Test: Manual
Change-Id: I7ea3e2cf88117ccef48f994719986e371e45d777
2018-07-19 13:03:16 +02:00
Remi NGUYEN VAN
605f12d6a5 Increase TEST_LINGER_DELAY_MS
The current timeout is short enough that lingered networks are torn down
before assertions can be run, causing flakyness in testMultipleLingering.
This CL sets the timeout to 300 in that particular test.

Verified that 300ms is enough with 500 successful runs on Sailfish.

An alternative would be to mock firing of the lingering timer, but
keeping the WakeupMessage logic realistic has already proven useful in
detecting races.

Bug: b/110673602
Test: runtest --no-hidden-api-checks frameworks-net
Change-Id: I6f9a656190bcff0b071ae2584d0f5fa74158472b
2018-07-19 17:12:38 +09:00
Aurimas Liutikas
43a71788b4 Merge "libmedia2_jni: use libbinder as shared library" into stage-aosp-master 2018-07-18 18:06:15 +00:00
Yifan Hong
b9fa97dff7 Merge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master 2018-07-18 17:25:51 +00:00
Steven Moreland
9f590ad031 libmedia2_jni: use libbinder as shared library
In order to prevent prebuilts from freezing the libbinder
internal API (the wire protocol), it is being made a
shared-only library.

Bug: 111454508
Test: m only
Change-Id: If7f8bd931dae5310eda6c230f20179418c2efa43
(cherry picked from commit a192e0e31400ac5a2b9d69788c7a60a89fb6c6ed)
Merged-In: If7f8bd931dae5310eda6c230f20179418c2efa43
2018-07-18 17:20:44 +00:00
Bernardo Rufino
cef59b95c9 Use Base64 from android.util in LocalTransport
Stop using bouncycastle as requested in the bug.

Bug: 111440841
Test: 1. Without changes
         a. adb shell bmgr transport android/com.android.internal.backup.LocalTransport
         b. adb shell bmgr backupnow com.android.providers.settings
         c. adb shell ls /cache/backup/1/_delta/<kv_package> #=> Base64 encoded keys
      2. Build and flash this CL
         a. adb shell bmgr restore 1 com.android.providers.settings #=> verify stuff restored
         b. adb shell rm /cache/backup/1/_delta/com.android.providers.settings/* /data/backup/com.android.internal.backup.LocalTransport/com.android.providers.settings
	 c. adb shell bmgr backupnow com.android.providers.settings
	 d. adb shell ls
	 /cache/backup/1/_delta/com.android.providers.settings # Verify same keys as 1c

Merged-In: I305bbae0e0af3639c1d45def19872e6da84624df
Change-Id: I305bbae0e0af3639c1d45def19872e6da84624df
(cherry picked from commit 7a6e03271995fa20754663a66cd334aebf077e84)
2018-07-18 17:26:24 +01:00
Fredrik Roubert
46c84f53a6 Merge "API updated for ICU4J 62.1"
am: e0ec160120

Change-Id: I19144ce1a0fd7d0a9781a71ebacec033a8affb19
2018-07-18 09:18:46 -07:00
eddy-sh.chen
369f587942 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing"
am: 2e08b42aff  -s ours

Change-Id: Ia000091649425fa1d1a2895ecc6a7f0f96157337
2018-07-18 09:14:47 -07:00
Treehugger Robot
e0ec160120 Merge "API updated for ICU4J 62.1" 2018-07-18 15:03:59 +00:00
Treehugger Robot
2e08b42aff Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing" 2018-07-18 14:59:20 +00:00
David Brazdil
2abea6bc94 [automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP"
am: 21593137ac  -s ours

Change-Id: I8bb94ce755d710460fcd74d2f8d4ab0d198ba533
2018-07-18 06:10:27 -07:00
Fredrik Roubert
9182e410ce API updated for ICU4J 62.1
- ICU 62 upgrades to Unicode 11. Add new APIs for Unicode 11.0

Bug: 109930825
Bug: 109837373
Test: make
Change-Id: I3f23bbe624a10511a613cb07fd35e8272d1461a2
2018-07-18 13:00:03 +00:00
David Brazdil
21593137ac Merge "[DO NOT MERGE] Update P light greylist in AOSP" 2018-07-18 11:49:00 +00:00
David Brazdil
cb1f5bc41e [DO NOT MERGE] Update P light greylist in AOSP
Publish the final light greylist of P for external developers.

Test: N/A
Change-Id: I5513ee2ee555bf1dced7f52b36de3df7ac85747a
2018-07-18 11:20:07 +00:00
eddy-sh.chen
bfc28a4348 [DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing
Bug: 80362864
Bug: 111478851

Change-Id: Iec6e27285bf35238d378e6561896f1d0b303fa24
2018-07-18 01:49:02 +00:00
Yifan Hong
58faaa09da IBatteryPropertiesRegistrar: remove unused functions
* Remove BatteryProperties
* Remove IBatteryPropertiesListener
* Remove IBatteryPropertiesRegistrar.(un)registerListener
  functions

Test: builds
Test: boots
Bug: 68724651
Change-Id: Ic9a9d337e5cb39784db1a2745297ef985dd31653
Merged-In: Ic9a9d337e5cb39784db1a2745297ef985dd31653
(cherry picked from commit dd0e942597b51e517eb65d9ea80595d46a3e89df)
2018-07-17 15:35:49 -07:00
Tyler Gunn
9bc17a66e6 [automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
am: bbe8990162  -s ours

Change-Id: Ic8cd7c12d58d9f75b1d952a7e9fca6cbe3f8fb33
2018-07-17 15:16:41 -07:00
Jerry Zhang
4bff76be80 Merge "UsbDescriptor: Add finite timeout to control transfer"
am: 20dca26f41

Change-Id: I86a916694a497bedb7d2df8a64dd17e0e15ce332
2018-07-17 13:59:15 -07:00