Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
418,808 Commits 3 Branches 0 Tags
0eaa0926fa2e8a7dd51ac2bd8b01411a5fac7137
Commit Graph

418808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Tate
0eaa0926fa Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into qt-dev 2020-03-30 16:53:21 +00:00
Chris Tate
e09a792002 Revert "Revoke 'always' web handler status when not autoverifying" 
This reverts commit a8fb6dc167.

Reason for revert: Inadvertently broke link handling stickiness even for well behaved apps

Bug: 146204120
Test: install app that handles web urls; set to 'always' in Settings;
install same apk again.  Verify that app is still in 'always' state via
'adb shell dumpsys package d'

Merged-In: If9046cb420961b8ef0333e9f1115eb69fb92242e
Merged-In: I36d9c352e741e88b9fc773b084bef3991b6d96ed
Change-Id: Ifac4f0c044c2c575a29bdd5ce5d14d12373fbe70
 2020-03-24 00:25:02 +00:00
TreeHugger Robot
3d4cf34685 Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into qt-dev 2020-03-11 19:25:05 +00:00
Automerger Merge Worker
d3579addfa [automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev am: 6c1414ffac am: 8d37b54e76 -s ours am: e776ad2c63 -s ours am: fee7e9913b -s ours 
am skip reason: subject contains skip directive

Change-Id: Iad167cc9497674c3e679721c6d6562c841b48dfd
 2020-03-11 10:07:43 +00:00
Automerger Merge Worker
8e258a182b [automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1c9bf5cc54 am: 2e254bb81e -s ours am: fb0419e165 -s ours am: 0361dab3d8 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib0198c47103d434a661d665ddd8fe25e52bbbeb6
 2020-03-11 10:07:28 +00:00
Automerger Merge Worker
fee7e9913b [automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev am: 6c1414ffac am: 8d37b54e76 -s ours am: e776ad2c63 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ica1f5e73e2f43e143f57c1ba3a831809ee9526d2
 2020-03-11 09:41:08 +00:00
Automerger Merge Worker
0361dab3d8 [automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1c9bf5cc54 am: 2e254bb81e -s ours am: fb0419e165 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6de3962c29dd112a7da39b374f8dcd9004267550
 2020-03-11 09:41:04 +00:00
Automerger Merge Worker
e776ad2c63 [automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev am: 6c1414ffac am: 8d37b54e76 -s ours 
am skip reason: Change-Id I60732f430256d37cb926d08d093581f051c4afed with SHA-1 0d7e27af30 is in history

Change-Id: I65557f8f81d1d3011a49bca1dcd8bcfa909c7b80
 2020-03-11 09:25:08 +00:00
Automerger Merge Worker
fb0419e165 [automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1c9bf5cc54 am: 2e254bb81e -s ours 
am skip reason: Change-Id I60732f430256d37cb926d08d093581f051c4afed with SHA-1 0d7e27af30 is in history

Change-Id: Ia63f63d741f7d84866165bd9bbd3422057af541b
 2020-03-11 09:25:03 +00:00
Automerger Merge Worker
8d37b54e76 Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev am: 6c1414ffac 
Change-Id: I74ae72db630d9b5ca6c9cf827e698b884d99edc8
 2020-03-11 09:07:15 +00:00
Automerger Merge Worker
2e254bb81e RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1c9bf5cc54 
Change-Id: Ie38d9bf7ac60dd60a2dc1d0aef798ddc01fe19f7
 2020-03-11 09:07:05 +00:00
TreeHugger Robot
6c1414ffac Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev 2020-03-11 08:53:52 +00:00
Riddle Hsu
1c9bf5cc54 RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo 
Originally, if the caller of navigateUpTo is alive, even the calling
uid is set to the caller who launched the existing destination activity,
the uid from caller process has higher priority to replace the given
calling uid. So this change doesn't modify the existing behavior if
the caller process is valid. Besides, the case of delivering new intent
uses the source record as calling identity too, so the case of starting
new activity should be consistent.

Also forbid attaching null application thread to avoid unexpected state
in process record.

Bug: 144285917
Test: bit FrameworksServicesTests:ActivityStackTests
Test: bit CtsSecurityTestCases:ActivityManagerTest# \
      testActivityManager_attachNullApplication
Merged-In: I60732f430256d37cb926d08d093581f051c4afed
Change-Id: I60732f430256d37cb926d08d093581f051c4afed
 2020-03-11 06:28:55 +00:00
Automerger Merge Worker
1a4d758e13 [automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7eea am: 4c05b6281c am: d8c53a1c5e -s ours am: 7681dc175c -s ours 
am skip reason: subject contains skip directive

Change-Id: I942303ce75a7da38b24029b1f8792251687fddd2
 2020-03-11 05:51:53 +00:00
Automerger Merge Worker
5fc924b419 [automerger skipped] RESTRICT AUTOMERGE am: 0bb93d4b1c am: d6f71caed5 am: b1fd7196e1 -s ours am: 102e9c5905 -s ours 
am skip reason: subject contains skip directive

Change-Id: I5f657da8ba424cbddb58ed97bd89272dd667798f
 2020-03-11 05:51:44 +00:00
Automerger Merge Worker
7681dc175c [automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7eea am: 4c05b6281c am: d8c53a1c5e -s ours 
am skip reason: subject contains skip directive

Change-Id: I1ceb382406b7b39714eb04480df10b23edf42d1c
 2020-03-11 05:39:09 +00:00
Automerger Merge Worker
102e9c5905 [automerger skipped] RESTRICT AUTOMERGE am: 0bb93d4b1c am: d6f71caed5 am: b1fd7196e1 -s ours 
am skip reason: subject contains skip directive

Change-Id: I38384364e078bc7e2c33918fef02d8e76fe88309
 2020-03-11 05:39:05 +00:00
Automerger Merge Worker
d8c53a1c5e Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7eea am: 4c05b6281c 
Change-Id: Ic62495057fe5008169cdad210635edd9fb0c3246
 2020-03-11 05:23:32 +00:00
Automerger Merge Worker
b1fd7196e1 RESTRICT AUTOMERGE am: 0bb93d4b1c am: d6f71caed5 
Change-Id: I7459b8f67496665d922e33b8fd8198b4519661e9
 2020-03-11 05:23:25 +00:00
Automerger Merge Worker
43e857c5c2 [automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-mr1-dev am: 3e2869e2c0 -s ours am: 72cb065b97 -s ours 
am skip reason: subject contains skip directive

Change-Id: I117494767666d32cae0e2c25ae3465988754ac15
 2020-03-11 05:09:32 +00:00
Automerger Merge Worker
cee788f5bd [automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into pi-dev am: 5c1ada4bb3 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib2a356e3e264ba7b3118b1bd3857b92a1425f58f
 2020-03-11 05:09:24 +00:00
Automerger Merge Worker
4c05b6281c Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7eea 
Change-Id: I9d5aa24139be221eee135a7d1bf1a98e57ae018c
 2020-03-11 05:08:36 +00:00
Automerger Merge Worker
29043c67d8 [automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into pi-dev am: 321b255d93 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9fdefbb508ebe16497b04f15e4a9894d9a376652
 2020-03-11 05:08:34 +00:00
Automerger Merge Worker
d6f71caed5 RESTRICT AUTOMERGE am: 0bb93d4b1c 
Change-Id: I7569bed67b835e6f9e86ca2b0dc1b3e6309545c7
 2020-03-11 05:08:32 +00:00
Automerger Merge Worker
72cb065b97 [automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-mr1-dev am: 3e2869e2c0 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib0708ca164443b156a31dd9082cf0ea259857c36
 2020-03-11 05:08:26 +00:00
TreeHugger Robot
5c1ada4bb3 Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into pi-dev 2020-03-11 04:55:07 +00:00
TreeHugger Robot
3e2869e2c0 Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-mr1-dev 2020-03-11 04:53:42 +00:00
TreeHugger Robot
133e0a7eea Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev 2020-03-11 04:53:16 +00:00
TreeHugger Robot
321b255d93 Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into pi-dev 2020-03-11 04:49:59 +00:00
Riddle Hsu
672530b42e Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into qt-dev 2020-03-11 04:43:24 +00:00
Automerger Merge Worker
1884cb7149 [automerger skipped] RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities am: 2be3ba4973 am: 0d8b222051 am: 3a6039d59a -s ours am: 862ceca282 -s ours 
am skip reason: subject contains skip directive

Change-Id: I33d4bf8a2ca3305ea5e5271d7e60f632e7f56a6d
 2020-03-10 21:54:05 +00:00
Automerger Merge Worker
862ceca282 [automerger skipped] RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities am: 2be3ba4973 am: 0d8b222051 am: 3a6039d59a -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib426e7a1a37051c635b6a17511fc26ba90098f98
 2020-03-10 21:39:22 +00:00
Automerger Merge Worker
3a6039d59a RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities am: 2be3ba4973 am: 0d8b222051 
Change-Id: I5da0350eb6a1bbd5956dd5daa9b5cf0d313a711d
 2020-03-10 21:21:48 +00:00
Automerger Merge Worker
0d8b222051 RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities am: 2be3ba4973 
Change-Id: I3429cb8f1ecd7e211ebee8ef3b739d9d4342fdad
 2020-03-10 21:01:51 +00:00
Automerger Merge Worker
a27754f5cd [automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-mr1-dev am: 4f486e9f0b -s ours am: 074acecf67 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id393a352e2318e08a57aa8f3cd038d0057c8adaf
 2020-03-10 17:47:00 +00:00
Automerger Merge Worker
074acecf67 [automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-mr1-dev am: 4f486e9f0b -s ours 
am skip reason: subject contains skip directive

Change-Id: I25cc26ee2447031bef53ca7d950edfc1c85ea99f
 2020-03-10 17:25:56 +00:00
TreeHugger Robot
4f486e9f0b Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-mr1-dev 2020-03-10 17:09:54 +00:00
Automerger Merge Worker
5d7dd7b2dd [automerger skipped] Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into pi-dev am: d9d727b959 -s ours 
am skip reason: subject contains skip directive

Change-Id: I21b061b1ef684241ab60ff6da481de6e4fbb4f7c
 2020-03-10 15:48:41 +00:00
TreeHugger Robot
d9d727b959 Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into pi-dev 2020-03-10 15:44:57 +00:00
Automerger Merge Worker
6e298f6477 [automerger skipped] Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into oc-mr1-dev am: 834e880978 -s ours am: da2c3df4ce -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib63aebfe756b579379b159d700fa83f5553e2d9f
 2020-03-10 15:41:24 +00:00
Automerger Merge Worker
da2c3df4ce [automerger skipped] Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into oc-mr1-dev am: 834e880978 -s ours 
am skip reason: subject contains skip directive

Change-Id: I1c492a2cbc7892fbce63d45e8cf43b76b8113c07
 2020-03-10 15:21:08 +00:00
TreeHugger Robot
834e880978 Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into oc-mr1-dev 2020-03-10 15:06:13 +00:00
Riddle Hsu
973ecc619c RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities 
Assume there are 2 applications A, B with different uids.
There are 4 activities A1, A2, B1, B2 with default task
affinity and launch mode.

After A1 called startActivities(B1, A2, B2):
 Original   : Task(A1, B1, A2, B2)
 This Change: Task(A1, B1), Task(A2, B2)
In other words, the source caller cannot launch its activity
above the activity of other application in the same task, and
it can still launch activity of other application in its task.

Bug: 145669109
Test: run cts --test android.server.cts.StartActivityTests \
      -m CtsServicesHostTestCases
Change-Id: I97bd875146a52f62b8fe82235487ccefb2955e8e
 2020-03-10 15:04:47 +00:00
Linus Tufvesson
0bb93d4b1c RESTRICT AUTOMERGE 
Block TYPE_PRESENTATION windows on default display

... and any other display that isn't considered a public presentation
display, as per Display.isPublicPresentation()

Bug: 141745510
Test: manual test via test app
Change-Id: I2aaab1903dee54190338f7b6e49888aa51437108
 2020-03-09 20:57:08 +00:00
Linus Tufvesson
7d4adf4d46 RESTRICT AUTOMERGE 
Block TYPE_PRESENTATION windows on default display

... and any other display that isn't considered a public presentation
display, as per Display.isPublicPresentation()

Bug: 141745510
Test: manual test via test app
Change-Id: I2aaab1903dee54190338f7b6e49888aa51437108
 2020-03-09 20:54:52 +00:00
Automerger Merge Worker
a032a689a3 [automerger skipped] Merge "DO NOT MERGE - Kill apps outright for API contract violations" into pi-dev am: 4bcf846f7a -s ours 
am skip reason: subject contains skip directive

Change-Id: If8d5b2092fab6b618c336228be1eb80a3a95081a
 2020-03-06 01:43:26 +00:00
TreeHugger Robot
4bcf846f7a Merge "DO NOT MERGE - Kill apps outright for API contract violations" into pi-dev 2020-03-06 01:24:29 +00:00
TreeHugger Robot
97f5b4092a Merge "DO NOT MERGE - Kill apps outright for API contract violations" into qt-dev 2020-03-06 01:15:38 +00:00
Automerger Merge Worker
27e5817c14 [automerger skipped] Merge "DO NOT MERGE Ensure package names read from config are system packages." into pi-dev am: d48077745e -s ours 
am skip reason: subject contains skip directive

Change-Id: I6ad69fe838bfad8214c14572309285c862c5944d
 2020-03-05 20:44:09 +00:00
TreeHugger Robot
a7a4d730ea Merge "DO NOT MERGE Ensure package names read from config are system packages." into qt-dev 2020-03-05 20:17:51 +00:00