git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Bryan Ferris [Wed, 26 Jun 2019 02:03:23 +0000 (19:03 -0700)]

[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner() am: 13a804ee27 -s ours
am: 73683643a8 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf60 is in history

Change-Id: I84997bae1ac598cc018fd9cfe39c8b06f6800e61

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bryan Ferris [Tue, 25 Jun 2019 20:32:26 +0000 (13:32 -0700)]

[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev am: 46c0bc9407
am: 752d4f8e96 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history

Change-Id: I309479f61253fa6cefec4377e000a3ab173a39c0

commit | commitdiff | tree

Bryan Ferris [Tue, 25 Jun 2019 20:32:03 +0000 (13:32 -0700)]

[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9 am: 51bb716332
am: ff8be5d87a -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history

Change-Id: I730d970d5b50cf8b4b0770da8ec22534a9e14a58

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bryan Ferris [Tue, 25 Jun 2019 18:36:14 +0000 (18:36 +0000)]

Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9
  [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65
  [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3
  [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60
  [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage

commit | commitdiff | tree

Bryan Ferris [Tue, 25 Jun 2019 18:36:14 +0000 (18:36 +0000)]

Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into oc-mr1-dev

commit | commitdiff | tree

Bryan Ferris [Thu, 6 Jun 2019 00:41:32 +0000 (17:41 -0700)]

Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into oc-dev am: 7af053390a
am: 21cd2569bf

Change-Id: If444013b7d35152ca49ccc20a89841b1e5582c62

commit | commitdiff | tree

Michael Wachenschwanz [Thu, 6 Jun 2019 00:38:43 +0000 (17:38 -0700)]

[automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf21 am: 86c9bdd251 am: 6d72c0681f am: d944d907df am: 31737b4618 am: 2ca66d4d10
am: 1c8a632ad2

Change-Id: I6cc244c8e40d66d639faef43ec8d3a23bfc11df7

commit | commitdiff | tree

Bryan Ferris [Thu, 6 Jun 2019 00:34:26 +0000 (17:34 -0700)]

Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into oc-dev
am: 7af053390a

Change-Id: Ie90797e6c620819b92b2bd32ad8a07363fbee947

commit | commitdiff | tree

Michael Wachenschwanz [Thu, 6 Jun 2019 00:07:58 +0000 (17:07 -0700)]

[automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf21 am: 86c9bdd251 am: 6d72c0681f am: d944d907df am: 31737b4618
am: 2ca66d4d10

Change-Id: I452bc18a9cebc417e7c4499c2bebf8fd3cc0f1ce

commit | commitdiff | tree

Bryan Ferris [Thu, 6 Jun 2019 00:01:53 +0000 (00:01 +0000)]

Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into oc-dev

* changes:
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8 am: 8c3a23e6b1 am: 22a1644e1f
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8 am: 8c3a23e6b1
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab
  Protect VPN dialogs against overlay.

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 17:32:04 +0000 (17:32 +0000)]

[automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf21 am: 86c9bdd251 am: 6d72c0681f am: d944d907df am: 31737b4618

Change-Id: I780fc62bcad56b4f1518a9a84ff7a77914f5c722

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 17:32:01 +0000 (17:32 +0000)]

[automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf21 am: 86c9bdd251 am: 6d72c0681f am: d944d907df

Change-Id: Ia92e1831963623df7931de17b029a92bab7f9374

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 17:31:57 +0000 (17:31 +0000)]

[automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf21 am: 86c9bdd251 am: 6d72c0681f

Change-Id: I38fbeaf20d21dd174e2b022196446631c20b2367

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 17:31:54 +0000 (17:31 +0000)]

[automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf21 am: 86c9bdd251

Change-Id: I16e96c2b33f18459189bfff359ae85483667a202

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 17:31:48 +0000 (17:31 +0000)]

[automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf21

Change-Id: I416ed302e6c680fd006bd9b38565ebfc8b132084

commit | commitdiff | tree

Michael Wachenschwanz [Thu, 16 May 2019 05:58:15 +0000 (22:58 -0700)]

Clear the Parcel before writing an exception during a transaction

This prevents any object data from being accidentally overwritten by the
exception, which could cause unexpected malformed objects to be sent
across the transaction.

Test: atest CtsOsTestCases:ParcelTest#testExceptionOverwritesObject
Bug: 34175893
Change-Id: Iaf80a0ad711762992b8ae60f76d861c97a403013
Merged-In: Iaf80a0ad711762992b8ae60f76d861c97a403013

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:18 +0000 (00:30 +0000)]

[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9

Change-Id: I978aa4f0d090b7cf2d0a1bb606b9f1e6732155b7

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:13 +0000 (00:30 +0000)]

[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65

Change-Id: I201858b931655939fd26bc3ba7052bbfebe6703e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:10 +0000 (00:30 +0000)]

[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3

Change-Id: I91d36de4c10c81554827995e1adce8f3d8c1d612

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:05 +0000 (00:30 +0000)]

[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60

Change-Id: I4679e1c6f44119e4f6504141d2614e4266ed7b36

commit | commitdiff | tree

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
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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:37 +0000 (18:09 +0000)]

[automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8 am: 8c3a23e6b1 am: 22a1644e1f

Change-Id: Ibf6f6756222042d8faf7342e365d37a4fa28cdc1

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:33 +0000 (18:09 +0000)]

[automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8 am: 8c3a23e6b1

Change-Id: Ifcd6f27ff206d4c81a2b2a1ee07d5e95b1a2a8e4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:30 +0000 (18:09 +0000)]

[automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8

Change-Id: I7f8a6762ceb6382f8c7f760a3d77a48b61f968a3

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:27 +0000 (18:09 +0000)]

[automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2

Change-Id: If900759c5c2c097a1f731859c49d3ed3b6608296

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:24 +0000 (18:09 +0000)]

[automerger] Protect VPN dialogs against overlay. am: 016c72c8ab

Change-Id: I09148d777617ccb4852931250f1b70314c41da48

commit | commitdiff | tree

Chalard Jean [Mon, 20 May 2019 04:11:37 +0000 (13:11 +0900)]

Protect VPN dialogs against overlay.

Bug: 130568701
Test: manual. After this, can't display on top of it
Change-Id: Ib032f800edb0416cc15f01a34954340d0d0ffa78
Merged-In: Ib032f800edb0416cc15f01a34954340d0d0ffa78
(cherry picked from commit 4e80dc2861614d25a1f957f50040a8cf04812d11)

commit | commitdiff | tree

Jonathan Scott [Wed, 22 May 2019 00:28:01 +0000 (17:28 -0700)]

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev am: 4c9fa739ff
am: 66785eeba5 -s ours
am skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1 cd6c636800 is in history

Change-Id: Ieb5f34b6aba4d9369be013a399652eac2f8210e0

commit | commitdiff | tree

Jonathan Scott [Wed, 22 May 2019 00:22:25 +0000 (17:22 -0700)]

[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc). am: 3be29d429b
am: c0c0827df5 -s ours
am skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1 cd6c636800 is in history

Change-Id: Ie04bbf63da652c54cf3eac6d6a480d239d165274

commit | commitdiff | tree

Jonathan Scott [Tue, 21 May 2019 20:57:03 +0000 (13:57 -0700)]

Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev
am: 4c9fa739ff

Change-Id: I300dda26365dab7052b74383a302676f3e99be55

commit | commitdiff | tree

Jonathan Scott [Tue, 21 May 2019 20:55:50 +0000 (13:55 -0700)]

[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc).
am: 3be29d429b

Change-Id: Ia12a64ca1bd24f4070c6413abe1369009aa6c349

commit | commitdiff | tree

TreeHugger Robot [Tue, 21 May 2019 18:32:27 +0000 (18:32 +0000)]

Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev

commit | commitdiff | tree

Jonathan Scott [Tue, 7 May 2019 15:54:32 +0000 (16:54 +0100)]

[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc).

Bug: 127605586
Test: Manual
Change-Id: Ifb049d147f9ef30976cdb93d7bf63a761efc1b86
Merged-In: I40c9a29935d9e5a27cdcdf90187efe61035448fd

commit | commitdiff | tree

Jonathan Scott [Thu, 9 May 2019 10:52:47 +0000 (11:52 +0100)]

[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev).

Bug: 127605586
Test: Manual
Change-Id: I40c9a29935d9e5a27cdcdf90187efe61035448fd

commit | commitdiff | tree

Jonathan Scott [Thu, 9 May 2019 01:48:36 +0000 (18:48 -0700)]

Merge changes from topic "am-f8d9284a-cfc8-4e4b-8915-eaac6542f6b5" into oc-dev am: 42fb96810e
am: 68c54d17e2

Change-Id: I315b894df15d7fd3dd1f74fdf323f07633981cd3

commit | commitdiff | tree

Jonathan Scott [Thu, 9 May 2019 01:38:58 +0000 (18:38 -0700)]

[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc skipped: ad38008f58 am: 970863ea62
am: 9707affaa8

Change-Id: Iba3263f17bb98cbad6239b04d6f3d7667312118a

commit | commitdiff | tree

Jonathan Scott [Thu, 9 May 2019 00:38:02 +0000 (17:38 -0700)]

Merge changes from topic "am-f8d9284a-cfc8-4e4b-8915-eaac6542f6b5" into oc-dev
am: 42fb96810e

Change-Id: Iae376975d87e030148b258cfeec3ab583b9f68fc

commit | commitdiff | tree

Jonathan Scott [Thu, 9 May 2019 00:34:19 +0000 (17:34 -0700)]

[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc skipped: ad38008f58
am: 970863ea62

Change-Id: I7cb30baeff59cbdfc688c9f44bfdb1c25f20f33a

commit | commitdiff | tree

TreeHugger Robot [Wed, 8 May 2019 23:21:42 +0000 (23:21 +0000)]

Merge changes from topic "am-f8d9284a-cfc8-4e4b-8915-eaac6542f6b5" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc skipped: ad38008f58
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c
  [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings.

commit | commitdiff | tree

Steven Moreland [Wed, 8 May 2019 21:37:05 +0000 (14:37 -0700)]

Merge "HwBlob: s/malloc/calloc/" into oc-dev am: 123ffb6202
am: f489aed3c1

Change-Id: Iea1bfc306161b065a3699fd780da28296f46dc96

commit | commitdiff | tree

Steven Moreland [Wed, 8 May 2019 21:20:20 +0000 (14:20 -0700)]

Merge "HwBlob: s/malloc/calloc/" into oc-dev
am: 123ffb6202

Change-Id: I8ecd922f540f9b93edd44056bf375e464c63eb54

commit | commitdiff | tree

TreeHugger Robot [Wed, 8 May 2019 20:49:53 +0000 (20:49 +0000)]

Merge "HwBlob: s/malloc/calloc/" into oc-dev

commit | commitdiff | tree

Christopher Dombroski [Wed, 8 May 2019 03:19:24 +0000 (20:19 -0700)]

OP_REQUEST_INSTALL_PACKAGES denied by default am: 43e682abef
am: 93780658ba

Change-Id: I3755a8c458b92e565d33779d3d4d3c7c6614cdf5

commit | commitdiff | tree

Christopher Dombroski [Wed, 8 May 2019 02:13:32 +0000 (19:13 -0700)]

OP_REQUEST_INSTALL_PACKAGES denied by default
am: 43e682abef

Change-Id: I13fd6fc7ba432a2cde1e8dbbc7b206e8203374f8

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 7 May 2019 19:42:03 +0000 (19:42 +0000)]

[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc skipped: ad38008f58

Change-Id: Ifdd51a2d215992ffde99f5b5adbac27808d27cbf

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 7 May 2019 19:41:27 +0000 (19:41 +0000)]

[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc

Change-Id: I56ea274e6a04f25a4556a675fc5896cb27271499

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 7 May 2019 19:40:52 +0000 (19:40 +0000)]

[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c

Change-Id: I2f2c6d9634df88a1f7a8eae1b3a76dea8b6a1479

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 7 May 2019 19:40:17 +0000 (19:40 +0000)]

[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518

Change-Id: I6a2f5b46c70720cedf377f107b77d590b297aea4

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 7 May 2019 19:39:38 +0000 (19:39 +0000)]

[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c

Change-Id: I29e8b905ef0450d9bd7a7fcd82411cffa84394d4

commit | commitdiff | tree

Jonathan Scott [Tue, 7 May 2019 15:27:17 +0000 (16:27 +0100)]

[RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings.

Bug: 127605586
Test: Manual
Change-Id: I5b5b0f9184220a4ed3080ca27792f66d1f5d41aa

commit | commitdiff | tree

Steven Moreland [Thu, 18 Apr 2019 23:32:42 +0000 (16:32 -0700)]

HwBlob: s/malloc/calloc/

Since this blob is passed between processes.

We could potentially only memset portions of the blob as it is
written to. However, the JHwBlob API itself doesn't have to have
writes in order (even though known usages of it do write in order).
Because of this, keeping track of which bytes to pad would be too
expensive.

Bug: 131356202
Test: boot, hidl_test_java
Change-Id: I48f4d7cb20c4bfe747dd323ae3744d323ad097c9
Merged-In: I48f4d7cb20c4bfe747dd323ae3744d323ad097c9

commit | commitdiff | tree

Christopher Dombroski [Tue, 16 Apr 2019 20:21:39 +0000 (13:21 -0700)]

OP_REQUEST_INSTALL_PACKAGES denied by default

Some system apps may download unknown content and the user should
be explicitly asked whether they trust these files. System apps should
explicitly use the extra NOT_UNKNOWN_SOURCE to bypass this check.

Test: Builds, boots, existing tests pass:
atest CtsPackageInstallTestCases

Locally verified they pass if CtsPackageInstallTestCases.apk was signed by
the platform cert.

Bug: 123700348
Change-Id: I3028bf8ff3f79a41521deeee43fba3c32bb1b2ca
Merged-In: I2578251906f6656b83464d1c4fc4db99165841c9

commit | commitdiff | tree

Eran Messeri [Thu, 11 Apr 2019 02:03:10 +0000 (19:03 -0700)]

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev am: 07a485743a
am: 30826bd658

Change-Id: I117d15dc0168ebd0f09835957e4b1757a1ae5a7c

commit | commitdiff | tree

Julia Reynolds [Thu, 11 Apr 2019 00:44:09 +0000 (17:44 -0700)]

Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev am: 2256fd4e11
am: 51fee974a9

Change-Id: I5c0f89e5614901b57880fff5b59a2f6766893903

commit | commitdiff | tree

Julia Reynolds [Thu, 11 Apr 2019 00:39:03 +0000 (17:39 -0700)]

Merge changes from topic "am-3ca7326a-cbf1-4f97-a1b5-a4fdfac0fb47" into oc-dev am: 652a666500
am: 5d35ad7446

Change-Id: I0e8dff954426479e5a58f0a8f0dad10a294f7b25

commit | commitdiff | tree

Eran Messeri [Thu, 11 Apr 2019 00:35:21 +0000 (17:35 -0700)]

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev
am: 07a485743a

Change-Id: I0ba4a71037e5bac19a540320665446b55b7aafb6

commit | commitdiff | tree

Pavel Grafov [Thu, 11 Apr 2019 00:29:31 +0000 (17:29 -0700)]

[automerger skipped] [automerger] Limit IsSeparateProfileChallengeAllowed to system callers am: 9061fcc46b am: 39f5432697 am: 9c0bc5405e am: 55209aca88 am: d5ce9a41b6 am: 20007cb46f
am: 3ae9c5c63b -s ours
am skip reason: change_id I2fef9ab13614627c0f1bcca04759d0974fc6181a with SHA1 1b6301cf24 is in history

Change-Id: I1065183419a6868c2f9d21ddae9b455056fbf963

commit | commitdiff | tree

Julia Reynolds [Thu, 11 Apr 2019 00:19:16 +0000 (17:19 -0700)]

Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev
am: 2256fd4e11

Change-Id: I1658f2dc59428265adf385ec2e9c579abbefb023

commit | commitdiff | tree

Julia Reynolds [Wed, 10 Apr 2019 23:56:01 +0000 (16:56 -0700)]

Merge changes from topic "am-3ca7326a-cbf1-4f97-a1b5-a4fdfac0fb47" into oc-dev
am: 652a666500

Change-Id: I4e93c29d4d65d14d39b683a27004f871b1dd0b9a

commit | commitdiff | tree

Pavel Grafov [Wed, 10 Apr 2019 23:41:27 +0000 (16:41 -0700)]

[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am: 9061fcc46b am: 39f5432697 am: 9c0bc5405e am: 55209aca88 am: d5ce9a41b6
am: 20007cb46f

Change-Id: I3bf88bf3a830dc7dea61e32d1df31b273a5d1afe

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into nyc-mr2-dev

* changes:
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c am: 75b579135c
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf
  Permission Check For DPM.getPermittedAccessibilityServices

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into nyc-mr1-dev

* changes:
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf
  Permission Check For DPM.getPermittedAccessibilityServices

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into nyc-dr1-dev

* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf
Permission Check For DPM.getPermittedAccessibilityServices

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]

Merge "Permission Check For DPM.getPermittedAccessibilityServices" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 23:26:00 +0000 (23:26 +0000)]

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev

* changes:
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c am: 75b579135c am: 0f19d41748
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c am: 75b579135c
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf
  Permission Check For DPM.getPermittedAccessibilityServices

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 23:26:00 +0000 (23:26 +0000)]

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into cw-f-dev

* changes:
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf
  Permission Check For DPM.getPermittedAccessibilityServices

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 22:59:44 +0000 (22:59 +0000)]

Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]

Merge changes from topic "am-3ca7326a-cbf1-4f97-a1b5-a4fdfac0fb47" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0 am: 777c45416e am: 0bf87880d8 skipped: 9f3fca716a
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0 am: 777c45416e am: 0bf87880d8
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0 am: 777c45416e
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0
  [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]

Merge changes from topic "am-3ca7326a-cbf1-4f97-a1b5-a4fdfac0fb47" into nyc-mr2-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0 am: 777c45416e am: 0bf87880d8
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0 am: 777c45416e
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0
  [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]

Merge changes from topic "am-3ca7326a-cbf1-4f97-a1b5-a4fdfac0fb47" into nyc-mr1-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0
  [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]

Merge changes from topic "am-3ca7326a-cbf1-4f97-a1b5-a4fdfac0fb47" into nyc-dr1-dev

* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]

Merge "[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]

Merge changes from topic "am-3ca7326a-cbf1-4f97-a1b5-a4fdfac0fb47" into cw-f-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0 am: 777c45416e
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0
  [automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0
  [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage

commit | commitdiff | tree

Julia Reynolds [Wed, 27 Mar 2019 16:15:57 +0000 (12:15 -0400)]

[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage

Test: atest
Fixes: 128599467
Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
(cherry picked from commit 657d164136199126ae241848887de0230699cea0)

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 10 Apr 2019 12:44:06 +0000 (12:44 +0000)]

[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am: 9061fcc46b am: 39f5432697 am: 9c0bc5405e am: 55209aca88 am: d5ce9a41b6

Change-Id: I9f9adc6f9979b3ee946e43150556f0ba971a67f8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 10 Apr 2019 12:44:01 +0000 (12:44 +0000)]

[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am: 9061fcc46b am: 39f5432697 am: 9c0bc5405e am: 55209aca88

Change-Id: I9f56349020376c4cb459597bf01cb4956344f7a8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:56 +0000 (12:43 +0000)]

[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am: 9061fcc46b am: 39f5432697 am: 9c0bc5405e

Change-Id: If32bb0948a2b9aa67b99ceae0ed9234f570198bf

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:51 +0000 (12:43 +0000)]

[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am: 9061fcc46b am: 39f5432697

Change-Id: I064e17eb9e4a91cbf8cda5fe6ee37da48724634d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:44 +0000 (12:43 +0000)]

[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am: 9061fcc46b

Change-Id: Ia35b381b55199cc0c3b516ccc5091993a2c3d488

commit | commitdiff | tree

Pavel Grafov [Wed, 10 Apr 2019 11:47:25 +0000 (12:47 +0100)]

Limit IsSeparateProfileChallengeAllowed to system callers

Fixes: 128599668
Test: build, set up separate challenge
Merged-In: I2fef9ab13614627c0f1bcca04759d0974fc6181a
Change-Id: I2fef9ab13614627c0f1bcca04759d0974fc6181a

commit | commitdiff | tree

Pavel Grafov [Wed, 10 Apr 2019 11:47:25 +0000 (12:47 +0100)]

Limit IsSeparateProfileChallengeAllowed to system callers

Fixes: 128599668
Test: build, set up separate challenge
Change-Id: I2fef9ab13614627c0f1bcca04759d0974fc6181a

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 9 Apr 2019 22:29:07 +0000 (22:29 +0000)]

[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0 am: 777c45416e am: 0bf87880d8 skipped: 9f3fca716a

Change-Id: I0dd61347ddd16574c9bb4f301725da09d88e737d

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 9 Apr 2019 22:29:04 +0000 (22:29 +0000)]

[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0 am: 777c45416e am: 0bf87880d8

Change-Id: If90b329955ca2514e6c236932614648670d440ea

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 9 Apr 2019 22:28:44 +0000 (22:28 +0000)]

[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0 am: 777c45416e

Change-Id: Ic6d7bf16ab67d441e77f003288129671c2ec327d

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 9 Apr 2019 22:28:40 +0000 (22:28 +0000)]

[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0

Change-Id: I362a9976890358467b16f07315295b17d767b9b1

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 9 Apr 2019 22:28:33 +0000 (22:28 +0000)]

[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0

Change-Id: Ic1d3439eb787c393d0f595d04c7627345118474d

commit | commitdiff | tree

Julia Reynolds [Wed, 27 Mar 2019 16:15:57 +0000 (12:15 -0400)]

[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage

Test: atest
Fixes: 128599467
Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
(cherry picked from commit 657d164136199126ae241848887de0230699cea0)

commit | commitdiff | tree

Bryan Ferris [Tue, 9 Apr 2019 20:56:40 +0000 (13:56 -0700)]

Merge changes from topic "am-e391c592-eeb3-4cc9-85fd-fa5d3bf694c5" into oc-dev am: 2833e406e0
am: ed9361ce1c

Change-Id: I8c538a46f02f4d46ddc5d78ee19612649c15a46c

commit | commitdiff | tree

Varun Shah [Tue, 9 Apr 2019 20:46:55 +0000 (13:46 -0700)]

Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 18e7dedf6c
am: 5e3ef6a1ea

Change-Id: I60be094774400df44d79a0291858a0783557831b

commit | commitdiff | tree

Bryan Ferris [Tue, 9 Apr 2019 20:20:18 +0000 (13:20 -0700)]

Merge changes from topic "am-e391c592-eeb3-4cc9-85fd-fa5d3bf694c5" into oc-dev
am: 2833e406e0

Change-Id: Iad49fea0efffc9766797f590b9140cb4bb73a3fd

commit | commitdiff | tree

Bryan Ferris [Tue, 9 Apr 2019 19:46:49 +0000 (19:46 +0000)]

Merge changes from topic "am-e391c592-eeb3-4cc9-85fd-fa5d3bf694c5" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568 am: 70b534799b am: 49a505f4f9 skipped: 022bfaa808
  [automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568 am: 70b534799b am: 49a505f4f9
  [automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568 am: 70b534799b
  [automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568
  [automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965
  [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser.

commit | commitdiff | tree

Varun Shah [Tue, 9 Apr 2019 19:12:19 +0000 (12:12 -0700)]

Added missing permission check to isPackageDeviceAdminOnAnyUser.
am: 18e7dedf6c

Change-Id: I3cd02487a2f39775e86c22ed12fb0fae45198ba4

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:47 +0000 (22:24 +0000)]

[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568 am: 70b534799b am: 49a505f4f9 skipped: 022bfaa808

Change-Id: I3bf41e099ceca0d122df82cf2f8a18d3ec8b3808

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:42 +0000 (22:24 +0000)]

[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568 am: 70b534799b am: 49a505f4f9

Change-Id: I0af65577fac55fce95549a27dc3ecf00b94d20ff

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:37 +0000 (22:24 +0000)]

[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568 am: 70b534799b

Change-Id: I172642a771dcafa2d106886984cba3de7a87ae03

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.