Commit Graph

9843 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Michael Wachenschwanz
d02c5d8400 Java side setup and access to Binder Proxy Tracking
Expose Binder Proxy Tracking by Uid from the native side. Enable
 tracking for SYSTEM and killing of any bad behaving uids.

Merged-In: Ifd6d0f30a93fad406417dd83c1495c105bced974
Change-Id: Ifd6d0f30a93fad406417dd83c1495c105bced974
Fixes: 63901963
Test: bit FrameworksCoreTests:android.os.BinderProxyCountingTest
(cherry picked from commit 55182464fb)
2018-06-28 22:17:22 +09:00
Dan Sandler
69baf0d2a4 Merge "P is for PAINT." into pi-dev
am: bed68535c0

Change-Id: Ibf1f14dea6efd09f5d2777d663bdfa69254d572d
2018-06-27 21:10:03 -07:00
Dan Sandler
45f17c5bef P is for PAINT.
Bug: 109925861
Test: adb shell am start \
        -a android.intent.action.MAIN \
        -c com.android.internal.category.PLATLOGO
Merged-In: Ic3020007c716be264e9523d6dbae9e13a95fa571
Change-Id: Ic3020007c716be264e9523d6dbae9e13a95fa571
2018-06-27 18:58:59 -04: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
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
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
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
Svet Ganov
cbd47f7937 Merge "Don't access keyguard from instant apps." into pi-dev
am: e7bd4e7e8f

Change-Id: I5d5d8ea0c7b5756143b5140e4cf16ae584147345
2018-06-07 22:12:45 -07:00
Svet Ganov
3ea66c319c Don't access keyguard from instant apps.
Test: cts-instant-tradefed run cts-instant -m CtsViewTestCases

bug:109652548

Change-Id: I6f8bb714bd98fd53068b2662633a9155d64b274c
2018-06-07 20:20:38 -07:00
Dan Sandler
396330a584 Merge "Delay pruning direct share targets." into pi-dev
am: 22385d9d4e

Change-Id: Ic94163018248073c54416a2196591af98e22e944
2018-06-05 16:55:06 -07:00
TreeHugger Robot
22385d9d4e Merge "Delay pruning direct share targets." into pi-dev 2018-06-05 22:55:44 +00:00
Svet Ganov
54f78810cc Don't access keyguard from instant apps.
am: e5a3125c1c

Change-Id: I1a6574d771f3e94727d85d24eb5f1abe1a0f388d
2018-06-05 14:34:22 -07:00
Svet Ganov
e5a3125c1c Don't access keyguard from instant apps.
Test: manual

bug:109652548

Change-Id: Ife1302e39e4f71f66d032619068a7e0214856b32
2018-06-05 20:29:40 +00:00
Dan Sandler
f5e17699e3 Delay pruning direct share targets.
Pruning was intended to remove targets corresponding to
now-missing packages, but in practice causes the list to
briefly disappear any time packages change:

    PACKAGE_CHANGED ->
	ResolverActivity.rebuildList() ->
	    ChooserActivity.onListRebuilt() with an empty
	    ResolverActivity.mDisplayList

In practice package changes happen all the time, so this
jank happens fairly often. (It contributed to b/67622422 as
well, since all this list rebuilding started animations that
locked out user input.)

This CL removes the old pruning process (comparing targets
against mDisplayList). Instead, we note that mDisplayList
got emptied, and lazily empty our own mServiceTargets once
we start getting responses back from all the services we
just re-queried.

The long-term fix here is to just rebuild all of this stuff.

Test: (1) share from Chrome
      (2) toggle the enable state of some random package
          to trigger PACKAGE_CHANGED, e.g.
          adb shell pm (enable|disable) com.android.egg
      (3) watch for jank
Bug: 109676071

Change-Id: Ie9d59b8f4b8cc8343beb40cbad6b8d52e5639082
2018-06-05 15:31:46 -04:00
Evan Rosky
9bf11ede69 Merge "Fixed a bug where sometimes unhandled handler would consume all keys" into pi-dev
am: 7ba4c2b254

Change-Id: Ia7fab42d36c8b58b05656cc2e5d1253449becf96
2018-05-30 15:02:51 -07:00
Evan Rosky
7ba4c2b254 Merge "Fixed a bug where sometimes unhandled handler would consume all keys" into pi-dev 2018-05-30 21:47:25 +00:00
Selim Cinek
0fc5e52023 Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev
am: d982210d89

Change-Id: I4b29f82656e3b3402f89cb5d66e71955287ac0b8
2018-05-29 18:59:25 -07:00
TreeHugger Robot
d982210d89 Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev 2018-05-30 00:52:32 +00:00