OSDN Git Service

android-x86/frameworks-base.git
4 years agoMerge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b0...
Automerger Merge Worker [Thu, 9 Jan 2020 13:40:20 +0000 (13:40 +0000)]
Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876

Change-Id: I4c255820617a86afdfa239febdd46fff7d082381

4 years agoMerge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev
TreeHugger Robot [Thu, 9 Jan 2020 13:25:46 +0000 (13:25 +0000)]
Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev

4 years agoMerge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am: e422bc0c8f
Automerger Merge Worker [Thu, 9 Jan 2020 00:08:31 +0000 (00:08 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am: e422bc0c8f

Change-Id: I7efbfda4517e46abf406fd53487836704a941a2e

4 years agoUse KNOWN_PACKAGES when shared lib consumers am: 08315953bc
Automerger Merge Worker [Thu, 9 Jan 2020 00:08:14 +0000 (00:08 +0000)]
Use KNOWN_PACKAGES when shared lib consumers am: 08315953bc

Change-Id: I3ab4cc8d36bd79f3b7342cf0d0fa3056d08988e7

4 years agoHandles null outInfo in deleteSystemPackageLI am: 6afabce549
Automerger Merge Worker [Thu, 9 Jan 2020 00:08:02 +0000 (00:08 +0000)]
Handles null outInfo in deleteSystemPackageLI am: 6afabce549

Change-Id: I077e6febea84013403feb65842ae99bc449ac737

4 years agoMerge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev
Bryan Ferris [Wed, 8 Jan 2020 22:46:45 +0000 (22:46 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev

* changes:
  Fixes NPE when preparing app data during init
  Use KNOWN_PACKAGES when shared lib consumers
  Handles null outInfo in deleteSystemPackageLI

4 years agoFixes NPE when preparing app data during init
Patrick Baumann [Wed, 6 Nov 2019 18:36:39 +0000 (10:36 -0800)]
Fixes NPE when preparing app data during init

When deleting an unused static shared library on Q, the user manager was
fetched via mContext.getSystemService. At this time during boot, the
service wasn't registered and so null was returned. This has already
been addressed in R with a move to injecting dependencies in the
PackageManagerService constructor.

Bug: 142083996
Bug: 141413692
Test: manual; remove static dependency on eng Q build and reboot
Change-Id: I8ae4e331d09b4734c54cdc6887b273705dce88b1
Merged-In: I8ae4e331d09b4734c54cdc6887b273705dce88b1

4 years agoUse KNOWN_PACKAGES when shared lib consumers
Patrick Baumann [Thu, 10 Oct 2019 22:50:28 +0000 (15:50 -0700)]
Use KNOWN_PACKAGES when shared lib consumers

This change ensures we find ALL known packages that could be consuming a
shared library, not only currently installed ones. Without this check,
the system may get into a state in which we have currently uninstalled
but on-device apps that depend on a shared library that does not exist
on device.

This change also leaves static shared library packages on device even if
it's not installed for any of the remaining users as it could still be
used, but marked uninstalled for users in which it is consumed.

Bug: 141413692
Bug: 142083996
Test: Manual; attempt to remove shared lib after marking its consumer uninstalled.
Test: atest StaticSharedLibsHostTests
Change-Id: Id4e37c3e4d3ea3ad5fddae5d2c7305e56f50eeea
Merged-In: Id4e37c3e4d3ea3ad5fddae5d2c7305e56f50eeea

4 years agoHandles null outInfo in deleteSystemPackageLI
Patrick Baumann [Fri, 23 Aug 2019 20:50:23 +0000 (13:50 -0700)]
Handles null outInfo in deleteSystemPackageLI

This change adds null checks before accessing outInfo in
deleteSystemPackageLI.

Bug: 142083996
Bug: 141413692
Test: manual; remove static dependency on eng build and reboot
Change-Id: If0fd48343e89cbb77ccd25826656194195d5b0cd
(cherry picked from commit 17471016508bb9c9ffb8c3946dda0b4897d722f1)
Merged-In: If0fd48343e89cbb77ccd25826656194195d5b0cd

4 years agoFix security problem on PermissionMonitor#hasPermission
paulhu [Mon, 16 Dec 2019 10:24:05 +0000 (18:24 +0800)]
Fix security problem on PermissionMonitor#hasPermission

PermissionMonitor#hasPermission only checks permssions that app
requested but it doesn't check whether the permission can be
granted to this app. If requested permission doens't be granted
to app, this method still returns that app has this permission.
Then PermissionMonitor will pass this info to netd that means
this app still can use network even restricted network without
granted privileged permission like CONNECTIVITY_INTERNAL or
CONNECTIVITY_USE_RESTRICTED_NETWORKS.

Bug: 144679405
Test: Build, flash, manual test
Change-Id: I5eba4909e4c2e1d9f275f66be90ac36466b93e90
Merged-In: I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4
Merged-In: Iae9c273af822b18c2e6fce04848a86f8dea6410a

4 years agoMerge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f
Automerger Merge Worker [Fri, 13 Dec 2019 17:02:07 +0000 (17:02 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f

Change-Id: I0b4b6a26b538d6f51780413376d70b6906877893

4 years agoRESTRICT AUTOMERGE am: fe4bf7926e
Automerger Merge Worker [Fri, 13 Dec 2019 17:01:46 +0000 (17:01 +0000)]
RESTRICT AUTOMERGE am: fe4bf7926e

Change-Id: I92627314fc09b129f37b08192084c5b807a00ed2

4 years agoMerge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev
Sterling Huber [Fri, 13 Dec 2019 16:44:15 +0000 (16:44 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev

4 years agoMerge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am: 09047...
Automerger Merge Worker [Thu, 12 Dec 2019 05:00:29 +0000 (05:00 +0000)]
Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am: 090476d5f3

Change-Id: I731a7fa2643382bd0df6f2107424d370a6f765b3

4 years agoDO NOT MERGE back porting for fixing sysui direct reply am: 08aae90860
Automerger Merge Worker [Thu, 12 Dec 2019 05:00:18 +0000 (05:00 +0000)]
DO NOT MERGE back porting for fixing sysui direct reply am: 08aae90860

Change-Id: Iebebd941ee806b4e06d35f2134113f609160396f

4 years agoMerge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev
TreeHugger Robot [Thu, 12 Dec 2019 04:00:33 +0000 (04:00 +0000)]
Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev

4 years agoMerge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into...
Automerger Merge Worker [Wed, 11 Dec 2019 19:10:38 +0000 (19:10 +0000)]
Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am: 70ffc41cad

Change-Id: I8439eee725f85cc1e939772663a4217e5dde2e38

4 years agoDO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5
Automerger Merge Worker [Wed, 11 Dec 2019 19:10:27 +0000 (19:10 +0000)]
DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5

Change-Id: I438383977e4b7454e732dba8d2906a8c333f2bad

4 years agoMerge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into...
Taran Singh [Wed, 11 Dec 2019 18:52:54 +0000 (18:52 +0000)]
Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev

4 years agoRESTRICT AUTOMERGE
Sterling Huber [Thu, 7 Nov 2019 19:04:03 +0000 (11:04 -0800)]
RESTRICT AUTOMERGE
Make toasts non-clickable

Since enforcement was only on client-side, in Toast class, an app could
use reflection (or other means) to make the Toast clickable. This is a
security vulnerability since it allows tapjacking, that is, intercept touch
events and do stuff like steal PINs and passwords.

This CL brings the enforcement to the system by applying flag
FLAG_NOT_TOUCHABLE.

Test: Construct app that uses reflection to remove flag FLAG_NOT_TOUCHABLE and
      log click events. Then:
      1) Observe click events are logged without this CL.
      2) Observer click events are not logged with this CL.
Bug: 128674520

Change-Id: Ica346c853dcb9a1e494f7143ba1c38d22c0003d0
Merged In: Ica346c853dcb9a1e494f7143ba1c38d22c0003d0

4 years agoresolve merge conflicts of 88c651eab144bf64acb1d99f11aabe983f23658c to oc-dr1-dev
Evan Laird [Thu, 14 Nov 2019 16:27:07 +0000 (11:27 -0500)]
resolve merge conflicts of 88c651eab144bf64acb1d99f11aabe983f23658c to oc-dr1-dev

Bug: 119041698
Test: atest SystemUITests
Change-Id: I9d1547f98cc19111ce2dc8ab2f4e2bf2d3cb0baa
Merged-In: I0680034ed9315aa2c05282524d48faaed066ebd0

4 years agoDO NOT MERGE back porting for fixing sysui direct reply
Yohei Yukawa [Sat, 19 Jan 2019 19:49:37 +0000 (11:49 -0800)]
DO NOT MERGE back porting for fixing sysui direct reply

Root cause: systemui run as user 0 service to handle all of users'
notifications. And, the users can user the copy/cut/paste
functionality.

Solution: To crate @hide API in TextView let SystemUI to mark the
TextView instance should check if the power of
INTERACT_ACROSS_USER_FULL is needed to be restricted.
e.x. Keyguard password textview/Notificaiton entries

Bug: 123232892
Test: manual test
Reference: I6d11e4d6a84570bc2991a8552349e8b216b0d139
Reference: Ibabe13e5b85e5bb91f9f8af6ec07c395c25c4393
Reference: I975baa748c821538e5a733bb98a33ac609bf40a7

Change-Id: I6d11e4d6a84570bc2991a8552349e8b216b0d139
Merged-In: Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937
Merged-In: I6d11e4d6a84570bc2991a8552349e8b216b0d139

4 years agoMerge "Force FGS notifications to show for a minimum time" into oc-dev
TreeHugger Robot [Fri, 8 Nov 2019 22:30:24 +0000 (22:30 +0000)]
Merge "Force FGS notifications to show for a minimum time" into oc-dev

4 years agoForce FGS notifications to show for a minimum time
Evan Laird [Wed, 6 Nov 2019 19:04:59 +0000 (14:04 -0500)]
Force FGS notifications to show for a minimum time

It's possible for a service to do a start/stop foreground and cause a
couple of things to happen:

NotificationManagerService will enqueue a EnqueueNotificationRunnable,
post a PostNotificationRunnable (for the startForeground), and then also
enqueue a CancelNotificationRunnable. There is some racy behavior here
in that the cancel runnable can get triggered in between enqueue and
post runnables. If the cancel happens first, then
NotificationListenerServices will never get the message.

This behavior is technically allowed, however for foreground services we
want to ensure that there is a minmum amount of time that notification
listeners are aware of the foreground service so that (for instance) the
FGS notification can be shown.

This CL does two things to mitigate this problem:

1. Introduce checking in the CancelNotificationRunnable such that it
will not cancel until after PostNotificationRunnable has finished
executing.

2. Introduce a NotificationLifetimeExtender method that will allow a
lifetime extender to manage the lifetime of a notification that has been
enqueued but not inflated yet.

Bug: 119041698
Test: atest NotificationManagerServiceTest
Test: atest ForegroundServiceLifetimeExtenderTest
Change-Id: I428bc334362f6e4b95f5f0c6974b71f76175c7ae
Merged-In: I0680034ed9315aa2c05282524d48faaed066ebd0

4 years agoMerge "DO NOT MERGE Validate wallpaper dimension while generating crop" into oc-dev
Ahan Wu [Wed, 6 Nov 2019 09:08:34 +0000 (01:08 -0800)]
Merge "DO NOT MERGE Validate wallpaper dimension while generating crop" into oc-dev
am: 17fd658061

Change-Id: I5d783568dd734e880b7d5a88117cbfad30c880ef

4 years agoDO NOT MERGE Validate wallpaper dimension while generating crop
Ahan Wu [Wed, 6 Nov 2019 09:08:32 +0000 (01:08 -0800)]
DO NOT MERGE Validate wallpaper dimension while generating crop
am: 160c28c36d

Change-Id: Icee3d103aee1d5775a7d8feeb7a0ac3fc9b7fa26

4 years agoMerge "DO NOT MERGE Validate wallpaper dimension while generating crop" into oc-dev
TreeHugger Robot [Wed, 6 Nov 2019 04:45:50 +0000 (04:45 +0000)]
Merge "DO NOT MERGE Validate wallpaper dimension while generating crop" into oc-dev

4 years agoMerge "Prevent system uid component from running in an isolated app process" into...
Jing Ji [Wed, 6 Nov 2019 00:13:50 +0000 (16:13 -0800)]
Merge "Prevent system uid component from running in an isolated app process" into oc-dev
am: 909ff7dc71

Change-Id: Ib725e69bbd84c7e1e141c32c62c5204bd552b12f

4 years agoOnly allow INSTALL_ALLOW_TEST from shell or root
Todd Kennedy [Wed, 6 Nov 2019 00:07:44 +0000 (16:07 -0800)]
Only allow INSTALL_ALLOW_TEST from shell or root
am: 702d394762

Change-Id: I6e19c9738e083ce8863ffd1d9d467cae2f973c37

4 years agoMerge "Prevent system uid component from running in an isolated app process" into...
Jing Ji [Tue, 5 Nov 2019 23:52:53 +0000 (23:52 +0000)]
Merge "Prevent system uid component from running in an isolated app process" into oc-dev

4 years agoPrevent system uid component from running in an isolated app process
Jing Ji [Mon, 4 Nov 2019 22:22:27 +0000 (14:22 -0800)]
Prevent system uid component from running in an isolated app process

Bug: 140055304
Test: Manua
Change-Id: Ie7f6ed23f0c6009aad0f67a00af119b02cdceac3
Merged-In: I5a1618fab529cb0300d4a8e9c7762ee218ca09eb

4 years agoOnly allow INSTALL_ALLOW_TEST from shell or root
Todd Kennedy [Fri, 20 Sep 2019 20:45:15 +0000 (13:45 -0700)]
Only allow INSTALL_ALLOW_TEST from shell or root

Bug: 141169173
Test: Manual. App can't be installed as test-only
Change-Id: Ib6dcca7901aa549d620448c0165c22270a3042be
Merged-In: Ib6dcca7901aa549d620448c0165c22270a3042be

4 years agoRESTRICT AUTOMERGE Revive runLimit check logic
Seigo Nonaka [Thu, 17 Oct 2019 00:14:15 +0000 (17:14 -0700)]
RESTRICT AUTOMERGE Revive runLimit check logic
am: b730f1984f

Change-Id: I329515d36c12ee5e12a63262ff7db8daff350832

4 years agoRESTRICT AUTOMERGE
Seigo Nonaka [Wed, 16 Oct 2019 21:48:30 +0000 (14:48 -0700)]
RESTRICT AUTOMERGE
Revive runLimit check logic

The runLimit check logic was accidentally removed by
I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735

Bug: 142134328
Bug: 140632678
Test: Manually done with reported step
Test: StaticLayoutTest passes
Change-Id: Ib1d5efdcb9adcc18a6a43370dc016ea464f48148

4 years agoRESTRICT AUTOMERGE Do not compute outside given range in TextLine
Seigo Nonaka [Wed, 2 Oct 2019 16:33:53 +0000 (09:33 -0700)]
RESTRICT AUTOMERGE Do not compute outside given range in TextLine
am: 4ce901e405

Change-Id: I739746d80a8dd29998a67c1d9aaa2d3f804ac57c

4 years agoDO NOT MERGE Validate wallpaper dimension while generating crop
Ahan Wu [Thu, 26 Sep 2019 11:00:26 +0000 (19:00 +0800)]
DO NOT MERGE Validate wallpaper dimension while generating crop

If dimensions of cropped wallpaper image exceed max texture size that
GPU can support, it will cause ImageWallpaper keep crashing
because hwui crashes by invalid operation (0x502).

Bug: 120847476.
Test: Write a custom app to set a 8000x800 bitmap as wallpaper.
Test: The cropped file will be 29600x2960 and make sysui keep crashing.
Test: After applyed this cl, wallpaper will use fallback.
Test: Sysui will not keep crashing any more.
Change-Id: Ifaf2085a0bc94448e49fa2f30066f47310586236

4 years agoRESTRICT AUTOMERGE
Seigo Nonaka [Mon, 16 Sep 2019 21:49:49 +0000 (14:49 -0700)]
RESTRICT AUTOMERGE
Do not compute outside given range in TextLine

This is second attempt of I646851973b3816bf9ba32dfe26748c0345a5a081
which breaks various layout test on application.
The empty string must be also handled by the TextLine since it
retrieves the default line height from the empty string.

Bug: 140632678
Test: StaticLayoutTest
Test: Manually done
Change-Id: I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735

4 years agoMerge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev
Jeff Sharkey [Thu, 12 Sep 2019 17:06:14 +0000 (10:06 -0700)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev
am: f8a2d069b4

Change-Id: If9534450fac2cd9b328f105be73f53c92ab14dbd

4 years agoRESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
Jeff Sharkey [Thu, 12 Sep 2019 17:06:09 +0000 (10:06 -0700)]
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
am: f683c688d5

Change-Id: I64ae89ecc92127de21503fbcfdd34c60a6f620bc

4 years agoMerge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
Jeff Sharkey [Thu, 12 Sep 2019 17:02:13 +0000 (10:02 -0700)]
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
am: 7633a081ab

Change-Id: Ia3853da8933c8c21fe06acad79059a3589eeb835

4 years agoRESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
Jeff Sharkey [Thu, 12 Sep 2019 17:02:05 +0000 (10:02 -0700)]
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am: 92e5e5e45c

Change-Id: I2e0a5c5cd35f9abcf362d3db4514e1bbd6bd7035

4 years agoMerge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev
Jeff Sharkey [Thu, 12 Sep 2019 16:33:21 +0000 (16:33 +0000)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev

4 years agoMerge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
Jeff Sharkey [Thu, 12 Sep 2019 16:33:13 +0000 (16:33 +0000)]
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev

4 years agoRESTRICT AUTOMERGE
Jeff Sharkey [Thu, 18 Jul 2019 00:51:28 +0000 (18:51 -0600)]
RESTRICT AUTOMERGE
Enable stricter SQLiteQueryBuilder options.

Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.

This change starts using setStrictColumns() and setStrictGrammar()
on SQLiteQueryBuilder to block this class of attacks.  This means we
now need to define the projection mapping of valid columns, which
consists of both the columns defined in the public API and columns
read internally by DownloadInfo.Reader.

We're okay growing sAppReadableColumnsSet like this, since we're
relying on our trusted WHERE clause to filter away any rows that
don't belong to the calling UID.

Remove the legacy Lexer code, since we're now internally relying on
the robust and well-tested SQLiteTokenizer logic.

Bug: 135270103135269143
Test: cts-tradefed run cts -m CtsAppTestCases -t android.app.cts.DownloadManagerTest
Change-Id: Iec1e8ce18dc4a9564318e0473d9d3863c8c2988a

4 years agoSet default phonebook access to ACCESS_REJECTED when user didn't choose one
Zongheng Wang [Wed, 11 Sep 2019 01:16:49 +0000 (18:16 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose one
am: 1f9309bd11

Change-Id: I142d2737f6444b5148963c1ca7af84e8cf0eded3

4 years agoRESTRICT AUTOMERGE
Jeff Sharkey [Tue, 16 Jul 2019 22:50:42 +0000 (16:50 -0600)]
RESTRICT AUTOMERGE
Strict SQLiteQueryBuilder needs to be stricter.

Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.

This change offers setStrictGrammar() to prevent this by outright
blocking subqueries in WHERE and HAVING clauses, and by requiring
that GROUP BY and ORDER BY clauses be composed only of valid columns.

This change also offers setStrictColumns() to require that all
untrusted column names are valid, such as those in ContentValues.

Relaxes to always allow aggregation operators on returned columns,
since untrusted callers can always calculate these manually.

Bug: 135270103135269143
Test: cts-tradefed run cts -m CtsDatabaseTestCases -t android.database.sqlite.cts.SQLiteQueryBuilderTest
Change-Id: I6290afd19c966a8bdca71c377c88210d921a9f25

4 years agoSet default phonebook access to ACCESS_REJECTED when user didn't choose
Zongheng Wang [Thu, 5 Sep 2019 20:44:28 +0000 (13:44 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose
one

When there's no users' choice to tell us whether to share their
phonebook information to the Bluetooth device, set the phonebook access
permission to ACCESS_REJECTED.

Bug: 138529441
Test: Manual test
Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df

4 years ago[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d...
Jonathan Scott [Mon, 9 Sep 2019 19:20:54 +0000 (12:20 -0700)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d6e8e am: 80e1c4fd36 am: 7b6a04fceb am: 743846742d
am: 0b1d526f50

Change-Id: Ie3f10bbed4bdb2bb7e141d7bb8d34e0b818c3f30

4 years ago[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d...
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:54 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d6e8e am: 80e1c4fd36 am: 7b6a04fceb am: 743846742d

Change-Id: Ia84a02b1b3ff3e9f4849554c6b2f0e904daadd05

4 years ago[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d...
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:50 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d6e8e am: 80e1c4fd36 am: 7b6a04fceb

Change-Id: I8914a6337a6e6c905b42cc498f34db5142db7a1a

4 years ago[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d...
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:45 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d6e8e am: 80e1c4fd36

Change-Id: I6ef1648f805c48ef37c8921ddfa1d147a8e5e032

4 years ago[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d6e8e
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:42 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d6e8e

Change-Id: I641d14a61338365b5da7f6c55ead2baff29e811c

4 years ago[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:35 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613

Change-Id: I6b5ad877382a352cb5b4bcdd05a2d19da502945a

4 years agoAdd MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc).
Jonathan Scott [Tue, 25 Jun 2019 09:58:06 +0000 (10:58 +0100)]
Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc).

Test: Just adding a constant
Bug: 132261064
Change-Id: I1527be03a10fa1a2fde09e3e41d6b7e83a986fc0
Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9

4 years agoDO NOT MERGE: Disable SpellChecker in secondary user's direct reply
Tarandeep Singh [Mon, 1 Jul 2019 21:27:25 +0000 (14:27 -0700)]
DO NOT MERGE: Disable SpellChecker in secondary user's direct reply

For secondary users, when AOSP keyboard is used to type in
direct-reply, unknown words can be added to dictionary.
It's *not* OK for SpellCheckerService of primary user to
check unknown words typed by a secondary user.
The dialog to add these words shows up in primary user instead.

TextView uses TextView#isSuggestionsEnabled() to determine if
SpellChecker is enabled. This can be disabled by setting the flag
TYPE_TEXT_FLAG_NO_SUGGESTIONS in inputType.

Note: This doesn't affect workprofile users on P or older versions since
they use same SpellCheckerService for all workprofiles.

Bug: 123232892
Test: Manually tested using the steps mentioned in the bug.
 1. Flash latest P build.
 2. Install AOSP keyboard (LatinIME) and set it as default.
 3. Install and open EditTextVariations
 4. Initiate direct reply in primary user and type non-english
    words like "ggggg hhhhh".
 5. Observe that they get red underline and tapping it brings "add
    to dictionary" popup.
 6. Create a new secondary user and switch to it.
 7. Once the setup completes, initiate a direct reply and type words
    similar to step 4.
 8. Verify that red underlines dont appear.
 9. switch back to primary user and verify direct reply still has red
    underlines.

Change-Id: I93918eb2c12e37908e03a7951a9e2c5375bc0ecc

4 years agoMerge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev
Bryan Ferris [Thu, 11 Jul 2019 00:13:54 +0000 (17:13 -0700)]
Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev
am: 4244190788

Change-Id: Id4563c2be11b532bdbd1b504b4a83734eed58708

4 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev
Bryan Ferris [Wed, 10 Jul 2019 23:52:52 +0000 (16:52 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev
am: 8abe600b81

Change-Id: I6a8ddfc1c5fb771194f9b7d6c5eb335b0ddc70c0

4 years agoMerge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev
Bryan Ferris [Wed, 10 Jul 2019 23:39:53 +0000 (23:39 +0000)]
Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev

* changes:
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: d3e81cd63f
  Fix Layout.primaryIsTrailingPreviousAllLineOffsets

4 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into nyc-mr2-dev
Bryan Ferris [Wed, 10 Jul 2019 23:39:53 +0000 (23:39 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into nyc-mr2-dev

4 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev
Bryan Ferris [Wed, 10 Jul 2019 23:11:15 +0000 (23:11 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev

4 years agoMerge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev
Bryan Ferris [Wed, 10 Jul 2019 22:01:49 +0000 (15:01 -0700)]
Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev
am: ecc48fbc96

Change-Id: Ie784856bd6bdb05921d7a3c6423ab7d103e5133c

4 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am...
Mihai Popa [Wed, 10 Jul 2019 21:56:38 +0000 (14:56 -0700)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d am: 126189263d
am: 29534f6c57

Change-Id: Id615c055975d251f45ec995c389e4acbe1274cd8

4 years agoMerge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into cw-f-dev
Bryan Ferris [Wed, 10 Jul 2019 21:11:06 +0000 (21:11 +0000)]
Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into cw-f-dev

* changes:
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04
  Fix Layout.primaryIsTrailingPreviousAllLineOffsets

4 years agoMerge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into nyc-mr1-dev
Bryan Ferris [Wed, 10 Jul 2019 21:11:06 +0000 (21:11 +0000)]
Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into nyc-mr1-dev

* changes:
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04
  Fix Layout.primaryIsTrailingPreviousAllLineOffsets

4 years agoMerge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into nyc-mr2-dev
Bryan Ferris [Wed, 10 Jul 2019 21:11:06 +0000 (21:11 +0000)]
Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into nyc-mr2-dev

* changes:
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04
  Fix Layout.primaryIsTrailingPreviousAllLineOffsets

4 years agoMerge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev
Bryan Ferris [Wed, 10 Jul 2019 21:11:06 +0000 (21:11 +0000)]
Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev

* changes:
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7 am: 2f9dd0cc12
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04
  Fix Layout.primaryIsTrailingPreviousAllLineOffsets

4 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into nyc-mr1-dev
Bryan Ferris [Wed, 10 Jul 2019 21:10:48 +0000 (21:10 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into nyc-mr1-dev

4 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:55 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7 am: 2f9dd0cc12

Change-Id: I287035dba62fde67b298ef638e2316b36837ee6b

4 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:52 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7

Change-Id: If8c3c336f3794cab0806a97a7f13d4aec38535c3

4 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:47 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605

Change-Id: I192651416d07a9adb1897efb7ed4882d94b8a43e

4 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:43 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c

Change-Id: I7490ff21f3c5183423bcb70f3d08c2879b80e28b

4 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:40 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04

Change-Id: I7fcc292a58dc297d2725ae3df99d637bbd1a8479

4 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:37 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d am: 126189263d

Change-Id: If52ab20b7cd84d02518bdfcd46987e329b654e2d

4 years agoFix Layout.primaryIsTrailingPreviousAllLineOffsets
Mihai Popa [Tue, 25 Jun 2019 10:15:18 +0000 (11:15 +0100)]
Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)

4 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:32 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d

Change-Id: I2a5373fa2ea348adde8e5592a5a9fa489c7fe12b

4 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:29 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d

Change-Id: I0c15ebaddd8d8edb9ff630ffbe4d855219b06907

4 years agoFix Layout.primaryIsTrailingPreviousAllLineOffsets
Mihai Popa [Tue, 25 Jun 2019 10:15:18 +0000 (11:15 +0100)]
Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)

4 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: d3e81cd63f
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:21 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: d3e81cd63f

Change-Id: I6373d3daeb8358316c0ae2757ed745202219e5c2

4 years agoFix Layout.primaryIsTrailingPreviousAllLineOffsets
Mihai Popa [Tue, 25 Jun 2019 10:15:18 +0000 (11:15 +0100)]
Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)

4 years agoFix Layout.primaryIsTrailingPreviousAllLineOffsets
Mihai Popa [Tue, 25 Jun 2019 10:15:18 +0000 (11:15 +0100)]
Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)

4 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Chienyuan [Wed, 10 Jul 2019 04:33:15 +0000 (21:33 -0700)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855 am: 3aaf2811fc
am: df484ced0b

Change-Id: I174f1594f8f7ae21979398ba29b961e95bd47c75

4 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Android Build Merger (Role) [Tue, 9 Jul 2019 07:11:53 +0000 (07:11 +0000)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855 am: 3aaf2811fc

Change-Id: Id1233680c478ff3367d69375056dd5d0bc1867ff

4 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Android Build Merger (Role) [Tue, 9 Jul 2019 07:11:47 +0000 (07:11 +0000)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855

Change-Id: Ieb2eab9943a3fde047fbfe947ccad105a5f7160d

4 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Android Build Merger (Role) [Tue, 9 Jul 2019 07:11:41 +0000 (07:11 +0000)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929

Change-Id: Iba55914648e687faaf01bc961c34efbdb72d6569

4 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Android Build Merger (Role) [Tue, 9 Jul 2019 07:11:36 +0000 (07:11 +0000)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3

Change-Id: I231941e32409574af8c15fe9e763169fe09b279f

4 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277
Android Build Merger (Role) [Tue, 9 Jul 2019 07:11:28 +0000 (07:11 +0000)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277

Change-Id: If9cb4de9ab510f1ddfff44a404a0a248cf9103dc

4 years agoHidProfile: sync isPreferred() with HidHostService
Chienyuan [Tue, 9 Jul 2019 07:09:56 +0000 (15:09 +0800)]
HidProfile: sync isPreferred() with HidHostService

HidHostService allow to connect when priority is PRIORITY_UNDEFINED.
HidProfile should return ture when priority is PRIORITY_UNDEFINED.
Otherwise, the "Input device" toggle in off state when HID device
connected.

Bug: 132456322
Test: manual
Change-Id: Id7bae694c57aec17e019d591c0a677e3cb64f845

4 years ago[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-second...
Bryan Ferris [Wed, 26 Jun 2019 01:47:02 +0000 (18:47 -0700)]
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-second" into oc-dev
am: 1bc24d1877 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf60 is in history

Change-Id: Ibfa0e299bcd796915886c17c4de2031881651801

4 years ago[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivit...
Bryan Ferris [Wed, 26 Jun 2019 01:40:56 +0000 (18:40 -0700)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95 skipped: a284320118 skipped: 14b074ddfe
am: b16bfc06a0 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf60 is in history

Change-Id: I5715e9f87cca3e468764468542204b254150630f

4 years ago[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivit...
Bryan Ferris [Wed, 26 Jun 2019 01:39:21 +0000 (18:39 -0700)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()
am: 13a804ee27 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf60 is in history

Change-Id: I7a716f77e85190143043e1a054e66226d3365601

4 years agoMerge changes from topic "bp-real-calling-(p|u)id-merge-second" into oc-dev
Bryan Ferris [Wed, 26 Jun 2019 00:49:56 +0000 (00:49 +0000)]
Merge changes from topic "bp-real-calling-(p|u)id-merge-second" into oc-dev

* changes:
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95 skipped: a284320118 skipped: 14b074ddfe
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95 skipped: a284320118
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c
  [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage

4 years ago[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivit...
Android Build Merger (Role) [Wed, 26 Jun 2019 00:48:49 +0000 (00:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95 skipped: a284320118 skipped: 14b074ddfe

Change-Id: I8f80b0babe463c6be9b3dc337921edc2fea55431

4 years ago[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivit...
Android Build Merger (Role) [Wed, 26 Jun 2019 00:48:47 +0000 (00:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95 skipped: a284320118

Change-Id: I8b67d639193d3546a63fc3b526353de5cafb4fb3

4 years ago[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivit...
Android Build Merger (Role) [Wed, 26 Jun 2019 00:48:44 +0000 (00:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95

Change-Id: If688033850b010958ba8795c2a85f4f060fccbb8

4 years ago[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivit...
Android Build Merger (Role) [Wed, 26 Jun 2019 00:48:41 +0000 (00:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a

Change-Id: I8cd17220b0f8f8a8fa88c97d82272f3c2b06fd85

4 years ago[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivit...
Android Build Merger (Role) [Wed, 26 Jun 2019 00:48:38 +0000 (00:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c

Change-Id: I0a070b8406a51759c3dbf2dbe291be2ec0913660

4 years ago[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivit...
Bryan Ferris [Tue, 21 May 2019 19:38:19 +0000 (12:38 -0700)]
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage

Previously startActivity would assume that the system was the calling user when
startActivityInPackage was called. Now the uid of the calling application is
forwarded by the system.

Test: manual; we added logging statements to check the value of realCallingUid
when launching the calendar app from the calendar widget and verified that it
was the calendar uid rather than the system uid.

Bug: 123013720
Change-Id: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e
Merged-In: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e

4 years ago[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by...
Bryan Ferris [Tue, 21 May 2019 19:38:19 +0000 (12:38 -0700)]
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()

Previously we'd ignore realCallingPid and realCallingUid that
PendingIntentRecord#sendInner() provided to startActivityInPackage().
Now we correctly pass it on, preserving past behaviour if none
provided.

Test: manual; we added logging statements to check the value of realCallingUid
in startActivitiesMayWait when launching the calendar app from the calendar widget
and verified that it was the calendar uid rather than the system uid.

Bug: 123013720
Change-Id: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e
Merged-In: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e

4 years agoMerge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev
Bryan Ferris [Tue, 25 Jun 2019 19:33:43 +0000 (12:33 -0700)]
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev
am: 46c0bc9407

Change-Id: I9640adc59d47dbbb36183073a1c6bc2d0624d893

4 years ago[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity()...
Bryan Ferris [Tue, 25 Jun 2019 19:33:37 +0000 (12:33 -0700)]
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9
am: 51bb716332

Change-Id: I163568da871059effe896507717480b61478797b