Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,841 Commits 1 Branch 0 Tags
b3c0a2a6c1ce4eaa0853101506760f87121d4b99
Commit Graph

59841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsung-Mao Fang
b3c0a2a6c1 Fix pendingIntent in SettingsSliceProvider could be Hijacked 
A malicious app is able to obtain this pending intent.
It can then mutate all fields except for the action and
launch the intent. This can be used to launch any activity
with the ACTION_SETTINGS action.

So, we enfore assign the package name for this intent,
it only can launch the settings app.

Fix: 147355897
Test: a) Install the new settings apk, and it won't launch other screen.
(See details in bug)
b) Start the settings search, slice search results work as normal.

Change-Id: Ie954d8a4b7153d6a4cac40621f363b45185990f2
 2020-03-04 19:08:46 +08:00
Automerger Merge Worker
dcf18af961 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9 am: 9ad579bfe6 am: 969e0fddc6 
Change-Id: Ic0dbe06c9583f519907c5d5abbe0d24f26d26a31
 2020-03-04 01:58:39 +00:00
Automerger Merge Worker
30d693cd85 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322 am: 0b924d6cad am: 8029e937dd 
Change-Id: I4bd3187185554aa1400891176160aebe8ac537a7
 2020-03-04 01:57:59 +00:00
Automerger Merge Worker
7d1749cb78 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: 0d7209e303 am: 8ae78e19a9 
Change-Id: I5da69404be6bda5c9c462b10d8e7e8ad5019edb0
 2020-03-04 01:56:34 +00:00
Automerger Merge Worker
969e0fddc6 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9 am: 9ad579bfe6 
Change-Id: I1a8d2a648ae152542968de06e5c1a368cc9cad4b
 2020-03-04 01:55:45 +00:00
Automerger Merge Worker
8029e937dd Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322 am: 0b924d6cad 
Change-Id: I54c0103e8b490a0423d968a1a2193243582929aa
 2020-03-04 01:42:48 +00:00
Automerger Merge Worker
9ad579bfe6 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9 
Change-Id: I2cb340913046145917130697dcf188fa372c0e86
 2020-03-04 01:40:49 +00:00
Automerger Merge Worker
8ae78e19a9 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: 0d7209e303 
Change-Id: Ia3d5e817750c398575c1116072a5b179e00702bf
 2020-03-04 01:40:08 +00:00
Automerger Merge Worker
0b924d6cad Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322 
Change-Id: I58d050e865f53aef709be9b27d3865e3307b8729
 2020-03-04 01:26:45 +00:00
Automerger Merge Worker
eb31d86af9 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a 
Change-Id: I131d6f9021fe9840b9617af4dfe5d6265371831e
 2020-03-04 01:26:42 +00:00
Automerger Merge Worker
0d7209e303 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a 
Change-Id: I34ef1774e79d6b280d34fb2298f316c15ea1480e
 2020-03-04 01:26:24 +00:00
Automerger Merge Worker
61c7581322 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 
Change-Id: I65ba4dcd05836f14b94da7811fc37ba92521efaf
 2020-03-04 01:13:19 +00:00
Automerger Merge Worker
9aebc16b6a Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 
Change-Id: Iac9a8770e495bcb01a8fc87436af66378f2c2b1f
 2020-03-04 01:13:07 +00:00
tim peng
8c07f06cd5 Merge "Add string for output switcher transferring error" into rvc-dev 2020-03-04 00:55:01 +00:00
Automerger Merge Worker
5c3675575d Merge "Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc" into rvc-qpr-dev-plus-aosp am: ed6a726216 
Change-Id: I25d63fcb913f9d506e4ef3890662d54ed8eaf13a
 2020-03-03 12:58:33 +00:00
Automerger Merge Worker
ccaacf5e00 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 43d72405b5 am: e358b7ab8c am: 2c2c1b9540 
Change-Id: I7acde12cd35cbbf2cf5a5d7a5e99c7ae17b600f7
 2020-03-03 12:58:25 +00:00
Automerger Merge Worker
c22840f7ec Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3cee900a20 am: 9c00d5db7b 
Change-Id: If0a32e40551cb39287b248ff481d8f60bc1e3610
 2020-03-03 12:58:18 +00:00
Automerger Merge Worker
ed6a726216 Merge "Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc" into rvc-qpr-dev-plus-aosp 2020-03-03 12:42:18 +00:00
Automerger Merge Worker
860971a028 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc 
Change-Id: I6b9b3f0705d0f479da006ecca58f12b086c60310
 2020-03-03 12:42:14 +00:00
Automerger Merge Worker
2c2c1b9540 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 43d72405b5 am: e358b7ab8c 
Change-Id: I104dab937a60a4f2b9cf03deeee9bd6a204765af
 2020-03-03 12:42:11 +00:00
Automerger Merge Worker
9c00d5db7b Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3cee900a20 
Change-Id: I70979fafb82a2986ebc582723c6d79c5e0a524b0
 2020-03-03 12:42:01 +00:00
Automerger Merge Worker
3a059026bc Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 
Change-Id: Icfd47c2e0d5dfcb04347167fb31c4cbda59a7bf1
 2020-03-03 12:25:31 +00:00
Automerger Merge Worker
e358b7ab8c Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 43d72405b5 
Change-Id: Icff2d3010afe04f74eb1639360324400a4add3ed
 2020-03-03 12:25:31 +00:00
Automerger Merge Worker
3cee900a20 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 
Change-Id: Ic87db00a6c97157d65b3b4d5b8138e73bbf40a62
 2020-03-03 12:25:25 +00:00
Automerger Merge Worker
43d72405b5 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f 
Change-Id: Icfa72b48ab61fc16fbfaa63aaa39ffa359523d08
 2020-03-03 12:12:32 +00:00
Automerger Merge Worker
36a30b38b9 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f 
Change-Id: I865472594bd8c37b1fda311e99276238fb15d2ac
 2020-03-03 12:12:23 +00:00
TreeHugger Robot
6acde7c21f Merge "ShortcutPreference Toggle design." into rvc-dev 2020-03-03 12:01:57 +00:00
Automerger Merge Worker
8cf53b4554 [automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours am: 68eb90cda8 -s ours am: fcaf45ba79 -s ours am: 6ecf807448 -s ours 
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12 is in history

Change-Id: I76d49519f5fbc03b808fb9d4d1e0066eac78dabf
 2020-03-03 11:33:46 +00:00
Automerger Merge Worker
2abdeb80c1 [automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours am: c1ee210aef -s ours am: a79cb95017 -s ours am: fe3216fad9 -s ours 
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a is in history

Change-Id: I99e0e6160bd49bf07e280f30b35e6e3d5357a457
 2020-03-03 11:33:44 +00:00
Automerger Merge Worker
6ecf807448 [automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours am: 68eb90cda8 -s ours am: fcaf45ba79 -s ours 
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12 is in history

Change-Id: I05032fb277c7da998c8f5ef7f12aefb06b86cc1c
 2020-03-03 11:18:47 +00:00
Automerger Merge Worker
fe3216fad9 [automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours am: c1ee210aef -s ours am: a79cb95017 -s ours 
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a is in history

Change-Id: I5c879a4397f97cbb3a34a22d3134a2e1b2e439c2
 2020-03-03 11:18:45 +00:00
Automerger Merge Worker
fcaf45ba79 [automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours am: 68eb90cda8 -s ours 
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12 is in history

Change-Id: Ib60019f859877fb46eed2c77d114a08fede3dad9
 2020-03-03 11:05:42 +00:00
Automerger Merge Worker
a79cb95017 [automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours am: c1ee210aef -s ours 
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a is in history

Change-Id: I0d58b4bb5baef39bc9b05dca64e432483d132d6f
 2020-03-03 11:05:40 +00:00
Automerger Merge Worker
68eb90cda8 [automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours 
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12 is in history

Change-Id: I23fc0161148e4c7f30b017a41fd04749f7d239d3
 2020-03-03 10:49:36 +00:00
Automerger Merge Worker
c1ee210aef [automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours 
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a is in history

Change-Id: I1e9547363f67b8bb1b79cb25961054b7efc5c4fa
 2020-03-03 10:49:35 +00:00
Automerger Merge Worker
db7e504c39 [automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: 4c435922e5 -s ours am: a43cd13dad -s ours am: fec1d3f158 -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history

Change-Id: Ib656716e0ee243c633ab9a7b7ffd43d8c4659728
 2020-03-03 10:30:21 +00:00
Automerger Merge Worker
f3495ff798 [automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 79741be4bc -s ours am: 8ad6d65c0a -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history

Change-Id: If8f75b81c1cedeeb37cadf736cdbaa20cbc57fea
 2020-03-03 10:29:59 +00:00
Automerger Merge Worker
42b698cdc5 Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 
Change-Id: I237ff4ef41d3dfb3fd74f74e0c252898d19962e5
 2020-03-03 10:27:48 +00:00
Automerger Merge Worker
c405329ce7 Remove reference to PhoneConstant. am: 28c11a8c01 
Change-Id: I635f49570f67f88cca0f937bb3aac3361f9a926a
 2020-03-03 10:27:47 +00:00
Automerger Merge Worker
4c3e56c6ce [automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 2149d18fb1 am: 3a82fc91d9 -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 56e8278498 is in history

Change-Id: I45dcf389f982ccf1ae1490ea5e3f38d8d7249aaa
 2020-03-03 10:27:35 +00:00
Automerger Merge Worker
fec1d3f158 [automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: 4c435922e5 -s ours am: a43cd13dad -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history

Change-Id: I5002bf7518dcee2ec32066818ecac1bd3d68c7b4
 2020-03-03 10:18:30 +00:00
Automerger Merge Worker
8ad6d65c0a [automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 79741be4bc -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history

Change-Id: Iec929aaea43c5a24cc4a310de03d34f3fd7a9ae9
 2020-03-03 10:17:47 +00:00
Automerger Merge Worker
3a82fc91d9 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 2149d18fb1 
Change-Id: I939122590d84a1b95a7c7247e289d14bb4a935a1
 2020-03-03 10:17:08 +00:00
Treehugger Robot
1ea70d24d5 Merge changes I193805ef,I2e1b9ac5 
* changes:
  [Settings] Replace isImsRegistered
  Remove reference to PhoneConstant.
 2020-03-03 10:15:27 +00:00
Automerger Merge Worker
a43cd13dad [automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: 4c435922e5 -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history

Change-Id: Ibb84fd8864ff09ccc924039f4c6a3d8c7028d4f8
 2020-03-03 10:04:14 +00:00
Automerger Merge Worker
79741be4bc Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a 
Change-Id: If3cfa6a75e1db2b7685385f60a7b3a0287a2836b
 2020-03-03 10:03:02 +00:00
Automerger Merge Worker
2149d18fb1 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a 
Change-Id: I110603e8a64b7dea0bf49728f7fb3df460598207
 2020-03-03 10:02:56 +00:00
Automerger Merge Worker
4c435922e5 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d 
Change-Id: I5145177f1e9c982af790b0f7aa95ceaf84161c39
 2020-03-03 09:52:20 +00:00
Automerger Merge Worker
b5191ad96a Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d 
Change-Id: I6d12c929d4fd1c763b6a49d4cfe7b82da5075e5d
 2020-03-03 09:52:01 +00:00
Alex Johnston
cf470fab9d Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev 2020-03-03 09:39:28 +00:00