Commit Graph

9725 Commits

Author SHA1 Message Date
David Brazdil
e10a083e57 Merge "Greylist requested hidden API" am: 473654c377
am: 9582cf7c1b

Change-Id: I635076240a90acd213a4ec73460e882b6a1a2a74
2018-08-22 07:32:03 -07:00
Mathew Inwood
aa3a71bd85 Merge "Add @UnsupportedAppUsage annotations" am: df82ab2de2
am: b6c87140c7

Change-Id: I659cfb3d4b18ccaf860721f5908a0d6d4814b3b1
2018-08-22 07:18:53 -07:00
David Brazdil
9582cf7c1b Merge "Greylist requested hidden API"
am: 473654c377

Change-Id: I01c25f8570851fee7f5db6f355de071acc1f095d
2018-08-22 06:08:03 -07:00
Mathew Inwood
b6c87140c7 Merge "Add @UnsupportedAppUsage annotations"
am: df82ab2de2

Change-Id: I05a2fa49b9400036f3388709e54f0165737887ee
2018-08-22 05:58:59 -07:00
David Brazdil
473654c377 Merge "Greylist requested hidden API" 2018-08-22 09:14:05 +00:00
David Brazdil
47451322ee Greylist requested hidden API
Greylist APIs from public requests which used to be off-limits because
the classes were not discovered by Doclava.

Bug: 79904498
Bug: 79902686
Test: N/A
Change-Id: If6678bed5c2da076f97e3de7ff0bc4e7ebaf1965
2018-08-21 16:59:24 +01:00
Mathew Inwood
c185f08c4a Add @UnsupportedAppUsage annotations
For packages:
  com.android.internal
  com.android.internal.annotations
  com.android.internal.app
  com.android.internal.app.procstats
  com.android.internal.appwidget
  com.android.internal.backup
  com.android.internal.car
  com.android.internal.content
  com.android.internal.inputmethod
  com.android.internal.location
  com.android.internal.logging
  com.android.internal.midi
  com.android.internal.net
  com.android.internal.os
  com.android.internal.policy
  com.android.internal.statusbar
  com.android.internal.telecom
  com.android.internal.telephony.euicc
  com.android.internal.textservice
  com.android.internal.util
  com.android.internal.view
  com.android.internal.view.animation
  com.android.internal.view.menu
  com.android.internal.widget

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I1c2954c5a579f073017c1794fd2d200e0a471602
Merged-In: Ib31b52e6957869e5744dadbb35cb4584ef17187f
2018-08-20 14:28:54 +01:00
Selim Cinek
e206929da3 Merge "Fixed an issue where the message could be empty" into pi-dev
am: 99168a6371

Change-Id: I848486310a74b37dcac41bf81a5746ca15dc0d7d
2018-08-17 15:26:03 -07:00
Selim Cinek
3c2fd6a1d7 Fixed an issue where the message could be empty
We're now making sure that the last message can never be too short
and we will therefore always see at least one message

Bug: 111576198
Test: Send message with "Text\r\n"
Change-Id: I4db0708511c45710540653501c845df5dd813545
2018-08-14 17:24:45 -07:00
Makoto Onuki
09663b4ada Merge "Add a hidden API for fgetfilecon(3)" am: 9b04b2fd0b am: c5d7fdef72
am: 39ddb130ec

Change-Id: Ib33c1e9f57ce727d6ecb1a5f799c0570c6b32208
2018-08-08 13:05:36 -07:00
Hugo Benichi
6d915c711f Merge "VPN: Implement toString for VpnConfig." am: c874462c2d am: 52f56a2948
am: e4e1ab85d9

Change-Id: If9b64dddcfafce5decf6b9de84481e2c1bc1dbab
2018-08-08 12:54:12 -07:00
Remi NGUYEN VAN
f76484af05 Merge "Add codewiz@, reminv@ to OWNERS for connectivity" am: 76f081be5c am: a96779b592
am: fb9247e38d

Change-Id: I755a029d35edb73924dbeccc698901dea533c57d
2018-08-08 12:21:25 -07:00
Makoto Onuki
39ddb130ec Merge "Add a hidden API for fgetfilecon(3)" am: 9b04b2fd0b
am: c5d7fdef72

Change-Id: I7a6876932b3eb8ecf61fa7c9470ae53ed1d8a0ae
2018-08-08 12:18:58 -07:00
Hugo Benichi
e4e1ab85d9 Merge "VPN: Implement toString for VpnConfig." am: c874462c2d
am: 52f56a2948

Change-Id: Ic07276029d19ac42da901183d247fe79a25c139a
2018-08-08 12:08:58 -07:00
Remi NGUYEN VAN
fb9247e38d Merge "Add codewiz@, reminv@ to OWNERS for connectivity" am: 76f081be5c
am: a96779b592

Change-Id: I781053bcceb117f3d83950a5ee477b766bb7e314
2018-08-08 11:57:20 -07:00
Makoto Onuki
9b04b2fd0b Merge "Add a hidden API for fgetfilecon(3)" 2018-08-08 14:51:19 +00:00
Hugo Benichi
c874462c2d Merge "VPN: Implement toString for VpnConfig." 2018-08-08 08:07:47 +00:00
Remi NGUYEN VAN
d2cb322e93 Add codewiz@, reminv@ to OWNERS for connectivity
Test: m
Change-Id: I11df4c93ac61b620fc576a2ff17192b7c9ecb984
2018-08-08 12:22:20 +09:00
Makoto Onuki
9700015b36 Add a hidden API for fgetfilecon(3)
Test: manual test with the debug code
Bug: 111381531
Change-Id: Ie9d6fe9e737b852cc825990a83bda6eb95cf1160
2018-08-06 14:31:45 -07:00
arangelov
487ca863a0 Merge "No disclaimer when switching profile for system SMS and dialer apps." into pi-dev
am: a7a496f3a1

Change-Id: I7a14ee395b21c8b6d9c81dc6d13497110bc336b4
2018-08-06 10:44:32 -07:00
Hugo Benichi
4d5c5d0ec4 VPN: Implement toString for VpnConfig.
Bug: 69426741
Test: Build, flashed, booted. Checked VpnConfig is printed as expected
in the logs.
Change-Id: I07629fa1df52b405de538953bb30f0fee5cf4fbf
2018-08-07 00:12:29 +09:00
arangelov
64439c1e8c No disclaimer when switching profile for system SMS and dialer apps.
This CL prevents the Toast message from showing when the following
conditions are met:
1. App is system app
2. Intent action is either ACTION_DIAL or ACTION_CALL or if it is
ACTION_SENDTO, only skip if data scheme is one of "sms:", "smsto:",
"mms:" or "mmsto:".

Bug: 111228250
Test: atest FrameworksCoreTests:IntentForwarderActivityTest
Change-Id: Idef71ff2928e9e3d72bad4ba8ff17f9306e91d25
2018-08-02 14:52:30 +01:00
Neil Fuller
f221bd013f Merge "Break some dependencies on libcore internals" am: f672c2bcb8 am: 8d59399398
am: e3b9960277

Change-Id: Ie28a471c402b9e6405a44ef8c9b5855158d12b80
2018-07-24 02:56:51 -07:00
Neil Fuller
e3b9960277 Merge "Break some dependencies on libcore internals" am: f672c2bcb8
am: 8d59399398

Change-Id: I06ccaff955d476cd6490729703b0000cbd4aa496
2018-07-24 02:47:25 -07:00
Neil Fuller
8d59399398 Merge "Break some dependencies on libcore internals"
am: f672c2bcb8

Change-Id: I234d938606b07a5116c39dfcc378d55bcd521c2d
2018-07-24 02:33:02 -07: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
Mike Ma
a31b0cf871 Merge "Fix a NPE in BatteryStatsImpl" into pi-dev
am: 0587bdd59f

Change-Id: I3bcc5d38995a38f068df6251826050fd59325e80
2018-07-20 21:14:10 -07:00
TreeHugger Robot
0587bdd59f Merge "Fix a NPE in BatteryStatsImpl" into pi-dev 2018-07-21 00:59:59 +00:00
TreeHugger Robot
680d6df80e Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master 2018-07-20 06:03:51 +00:00
Jinguang Dong
7e49326439 Merge "Ensure dropbox could copy tombstone files to special folder." am: 12cdea59d3 am: 3034085dff
am: 38c07c31dd

Change-Id: Id462f492b9a7882c700d090dcfe5eb366f44556f
2018-07-19 16:12:12 -07:00
Jinguang Dong
56bb0b7219 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
(cherry picked from commit fe8d2c9a8c)
2018-07-19 16:06:43 -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
Treehugger Robot
12cdea59d3 Merge "Ensure dropbox could copy tombstone files to special folder." 2018-07-19 21:10:43 +00:00
Xin Li
ef7cd8095c Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
Bug: 111615259
Change-Id: I0f2e2a580ade052b309802599141315c16e59aa2
2018-07-19 13:50:26 -07:00
Andreas Gampe
02f0c20563 Merge "Frameworks: Let GuardedBy accept multiple locks" am: 940a9e95df am: b32933c3cc
am: a48b21a802

Change-Id: I59fd2f34f26a036387e909b6ad9f6c78b6bdc897
2018-07-19 12:27:03 -07:00
Neil Fuller
44b035185c Merge "Use Base64 from android.util in LocalTransport" am: 8b9f98536e am: ec99ee195c
am: a234b4579c

Change-Id: I5b7caa54102f2334e6b15699bb0846c721cd9922
2018-07-19 12:15:37 -07: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
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
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 7a6e032719)
2018-07-18 17:26:24 +01:00
Treehugger Robot
62d5e041a2 Merge "Java side setup and access to Binder Proxy Tracking" 2018-07-10 16:24:47 +00:00
Neil Fuller
f53c7a2ae5 resolve merge conflicts of 7980b19bc8 to stage-aosp-master
am: 3147288c3b

Change-Id: Ie04ef5cd3277271304c3564ee6e41d8c24dee74c
2018-07-06 09:59:52 -07:00
Neil Fuller
3147288c3b resolve merge conflicts of 7980b19bc8 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica0d3578c6e3fcd17b350f63b4acd471774ac014
2018-07-06 16:32:44 +01:00
Treehugger Robot
7980b19bc8 Merge "Track changes in libcore to remove a constructor" 2018-07-06 13:58:29 +00:00
Neil Fuller
9ca5d6f0a0 Merge "Track constructor changes in libcore/" am: f94eb29500
am: 67dcf6da3c

Change-Id: I1205219e1fead95ecdb8f9ce5d503ec416baf4c2
2018-07-05 05:25:35 -07:00
Neil Fuller
67dcf6da3c Merge "Track constructor changes in libcore/"
am: f94eb29500

Change-Id: I344d9210bd173f78651318366c852f65afe969d6
2018-07-05 05:14:26 -07:00
Neil Fuller
baae7fa357 Track changes in libcore to remove a constructor
Track changes in libcore to remove a constructor + lint
import order changes. Instead of the constructor a utility
method is introduced.

Test: Build / boot
Bug: 111055375
Merged-In: Id683a9d9d6e27d4c8df623dae189da9e74a6d410
Change-Id: Id683a9d9d6e27d4c8df623dae189da9e74a6d410
2018-07-04 09:11:08 +01:00
Neil Fuller
038b20c99b Track constructor changes in libcore/
The 2-arg constructor is being removed.

Test: build / boot
Bug: 111055375
Change-Id: I72413a8c7885f9514a88f59deb649fa755deff92
2018-07-03 19:22:45 +01:00