Winson Chiu
9109ce178e
Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev
2020-12-08 00:26:44 +00:00
Winson
4e71b31e0c
Remove updateIntentVerificationStatusAsUser from ResolverActivity
...
DO NOT CHERRY PICK ANYWHERE: Security issue
This API is meant to grant an app complete verification over the
domains it has declared, meaning it will always resolve the domains it
declares for web links.
This can allow an app to take over links that are unowned. Any time a
user selects "Always" when resolving an Intent in the diambiguation
dialog, this API would be called, and all subsequent resolutions of any
domain declared by the app selected would be automatically directed to
that app, with no prompt to the user.
From a quick search, it's possible that all usages of this API are
actually unintended and should be removed. Should be considered for
deprecation in the future.
Bug: 163358811
Test: none, this is not generally testable, see linked bug for context
Merged-In: Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6
Change-Id: Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6
2020-10-28 20:57:54 +00:00
Ivan Chiang
42c44f3601
Revoke the uri permission when the file is deleted
...
When the file is deleted, renamed or moved, revoke all uri
permissions with the file
Bug: 157474195
Test: manual test with DocumentsUI
Test: atest DocumentsTest#testAfterMoveDocumentInStorage_revokeUriPermission
Change-Id: I4ffb183630aadb2d87b0965e8cecf88af15f4534
Merged-In: I4ffb183630aadb2d87b0965e8cecf88af15f4534
(cherry picked from commit 9efd606f43
2020-09-01 05:27:07 +00:00
Steve Elliott
d5bed0f4b6
DO NOT MERGE: Add configurable default setting for assistant componentname
...
By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.
Test: manual
Bug: 111603898
Change-Id: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
Merged-In: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
2018-10-19 16:24:19 -04:00
Alan Viverette
ad3035353d
Merge changes from topic "viewpager_state" into oc-dev am: 77edd5fabe
...
am: 5811482acf
2018-03-09 20:49:36 +00:00
Alan Viverette
5811482acf
Merge changes from topic "viewpager_state" into oc-dev
...
am: 77edd5fabe
2018-03-09 20:15:45 +00:00
Alan Viverette
77edd5fabe
Merge changes from topic "viewpager_state" into oc-dev
...
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667caebf5c06dfd04ccc6608b3e984c412187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667caebf5c06dfd04ccc6608187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667caebf5c06df187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667c187964aca14c24e4d831fece305de0cb362192e8bc42f76941187964aca14c24e4d831fece305de0cb362192e8187964aca14c24e4d831fece305de0187964aca14c24e4d831187964aca1
2018-03-09 18:43:02 +00:00
Fyodor Kupolov
d258da6a80
Merge changes from topic "am-74e79eb6-59c1-4f9c-a993-72eeee3859c4" into oc-dev am: b6b6c01847
...
am: bdc573b39b
2018-03-08 21:27:20 +00:00
Fyodor Kupolov
bdc573b39b
Merge changes from topic "am-74e79eb6-59c1-4f9c-a993-72eeee3859c4" into oc-dev
...
am: b6b6c01847
2018-03-08 20:54:39 +00:00
Android Build Merger (Role)
286944d5c9
[automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e am: fa32631c63 am: 3a295c1c7f
...
Change-Id: I720535127956baa76dc6dbad42b9ec92a819916f
2018-02-21 20:27:16 +00:00
Android Build Merger (Role)
3a295c1c7f
[automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e am: fa32631c63
...
Change-Id: I1d42aa3bea943a1564741443fb7db3ec98583fe3
2018-02-21 20:27:11 +00:00
Android Build Merger (Role)
fa32631c63
[automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e
...
Change-Id: Ib60d63bcc8769f10a64753f7fccf07c103b35c09
2018-02-21 20:27:06 +00:00
Android Build Merger (Role)
e0b5c2d25e
[automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb
...
Change-Id: I5fb0625286289c43644612528d25fb3f90f6ec7b
2018-02-21 20:27:01 +00:00
Android Build Merger (Role)
71478241eb
[automerger] Verify last array's length in readFromParcel am: 3b8bc2e450
...
Change-Id: If09aad1fa86dbc5c6223d06f67b81d45660ca2d3
2018-02-21 20:26:56 +00:00
Fyodor Kupolov
3b8bc2e450
Verify last array's length in readFromParcel
...
Length of the last array in readFromParcel should be the same as
value of mNextIndex.
Test: PoC app in the bug
Bug: 73252178
Change-Id: I69f935949e945c3a036b19b4f88684d906079ea5
2018-02-21 20:26:52 +00:00
Android Build Merger (Role)
705e28e26b
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608 am: b3e984c412
...
Change-Id: I5217e675455809ee18c9a0b06bb3b740d01c09f8
2018-02-16 19:46:21 +00:00
Android Build Merger (Role)
b3e984c412
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608
...
Change-Id: I65d895c9ea8506227ad5ba7c77d44827b0cd80fe
2018-02-16 19:46:15 +00:00
Android Build Merger (Role)
d04ccc6608
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df
...
Change-Id: Iedd1e0502ac237920b24cac81a2540cfcf4c8d87
2018-02-16 19:46:09 +00:00
Android Build Merger (Role)
aebf5c06df
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c
...
Change-Id: Ia150bf95186b1a7acdec0d723d44f33040951f56
2018-02-16 19:46:03 +00:00
Android Build Merger (Role)
c42091667c
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941
...
Change-Id: Id69b35c6cc53b6cea1666d724813ae21634c0b4c
2018-02-16 19:45:57 +00:00
Android Build Merger (Role)
bc42f76941
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
...
Change-Id: Ie379f04b1e570ebc94a9e5c37ab3ddbf469acb93
2018-02-16 19:45:41 +00:00
Android Build Merger (Role)
cb362192e8
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
...
Change-Id: Ie54af74e2ab273be07c4cd73881010ee952997ef
2018-02-16 19:45:36 +00:00
Android Build Merger (Role)
fece305de0
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
...
Change-Id: I33e06bfcad6941fd8845f443991dfbcbd4167348
2018-02-16 19:45:30 +00:00
Android Build Merger (Role)
4c24e4d831
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
...
Change-Id: Ia2d011a3e2c705e82ab11dbf571f6f52cf05bae8
2018-02-16 19:45:24 +00:00
Alan Viverette
187964aca1
Update internal ViewPager's SavedState to match Support Library version
...
Merged-In: Ic4569b21d8a26a62bba91742b442f0c3ea8bcc9e
Change-Id: I17d085be9ce1a139e75264f1e715df7f565cd41b
Fixes: 71992105
Test: manual
2018-02-16 14:45:05 -05:00
Rubin Xu
a7483c90c1
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7 am: bf1ecab901
...
am: 7ac2108ed3
2018-02-07 22:14:48 +00:00
Rubin Xu
7ac2108ed3
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7
...
am: bf1ecab901
2018-02-07 21:59:55 +00:00
Android Build Merger (Role)
bf1ecab901
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7
...
Change-Id: I9af74b6a8fd17dbc9c8c1edebc0db81a07d2e8dc
2018-02-07 08:19:03 +00:00
Android Build Merger (Role)
469065ccb7
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926
...
Change-Id: Ic3e36a94f5c7b3cf33b8c7972fc1bd254be9a31c
2018-02-07 08:18:57 +00:00
Android Build Merger (Role)
f097744926
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97
...
Change-Id: Ic3b71eb297425e9ff6d40c542aa67027317dffea
2018-02-07 08:18:50 +00:00
Android Build Merger (Role)
4af59f1c97
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483
...
Change-Id: Ie3d39f4c402d3385f45aca01059f03ef4025855f
2018-02-07 08:18:44 +00:00
Android Build Merger (Role)
ab36ba8483
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2
...
Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60
2018-02-07 08:18:37 +00:00
Android Build Merger (Role)
b3012285e2
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2
...
Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177
2018-02-07 08:18:22 +00:00
Android Build Merger (Role)
4405b0ced2
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f
...
Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72
2018-02-07 08:18:15 +00:00
Android Build Merger (Role)
83cb35453f
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d
...
Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55
2018-02-07 08:18:09 +00:00
Android Build Merger (Role)
0231bc4d6d
[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888
...
Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62
2018-02-07 08:18:02 +00:00
Rubin Xu
54813e9888
Fix VerifyCredentialResponse parcelling code
...
There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.
Test: none
Bug: 71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353
2018-02-07 08:17:06 +00:00
Lucas Dupin
12dad0c4fc
Turn default gradient into solid black
...
Test: visual
Bug: 66957450
Change-Id: I6a34a35912e4dd4594565f88636ce89689d26f2f
(cherry picked from commit e7476addec
2018-01-05 22:59:49 +00:00
Christine Franks
8ab97c1e41
Respect legacy color mode settings
...
Bug: 68411440
Test: make -j100, verified starting with each of the three options.
Change-Id: I73e701a86733e0f8a5d017949052b16cdf58f398
(cherry picked from commit 17947177b3
2017-10-31 15:23:55 +00:00
Christine Franks
cf74d28888
Support native and srgb for night display
...
Bug: 68159303
Test: make -j100
Merged-In: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
2017-10-26 13:22:46 -07:00
Christine Franks
8c9f91eba6
DO NOT MERGE - Support native and srgb for night display
...
Bug: 68159303
Test: make -j100
Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
2017-10-25 12:43:10 -07:00
Patrik Torstensson
20fb01eb23
Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev
2017-10-13 01:30:40 +00:00
Robert Benea
5e099800f8
Incorporate slab reclaimable into meminfo
...
Instead of using the whole slab mem for kernel usage, split the
unreclaimable to kernel and reclaimable to cache (since is freed
under mem. pressure).
Test: tested on gobo
Bug:67753120
Change-Id: I0f5a310bb88603ad7bb28e5398ea57c249c04fc2
2017-10-13 00:41:47 +00:00
Mike Ma
1ce1d3a42c
Add AOD metrics in batterystats
...
Fixes: 64899521
Test: manual - flash build, reset batteryStats, use device > 1 hr
with alternating pattern between screen on/off/AOD. Dump stats, check
all screen related stats look normal, esp. record matches actual time
spent in each screen state. In raw bugreport:
Search "amount discharged" for % discharge;
Search "Screen on/off/doze discharge" for mAh discharge;
Search "time on battery" for up/real time in each state.
Test: Added two unit tests for note AOD screen state
Merged-In: I7193a36751124dd380818b2b665303c0f0d8c984
Change-Id: I51cead7f92abd9e4c620f7dfde393993cdad494e
2017-10-06 00:50:03 +00:00
TreeHugger Robot
cbe8754184
Merge "Lower watchdog timeout for ChooserTargetService responses" into oc-mr1-dev
2017-10-02 20:40:37 +00:00
TreeHugger Robot
dab9eff899
Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev
2017-10-02 17:44:57 +00:00
Adam Powell
3f23dfc6c1
Lower watchdog timeout for ChooserTargetService responses
...
Services providing direct share targets were given up to 5 seconds
to respond to a query, and for UI stability we don't show any until
all services have responded. 5 seconds is a long time to wait and
leads to user complaints when there is even one app that doesn't
respond in time.
Lower the timeout to 2 seconds as a more reasonable maximum.
Bug: 67306843
Test: manual, existing CTS
Change-Id: If55f0485240bc3ccbf8a32aa0e15903ea574ec2b
2017-10-02 10:41:03 -07:00
TreeHugger Robot
5802026595
Merge "Adjusted chooser padding so 2nd line isn't cutoff." into oc-mr1-dev
2017-09-26 23:14:08 +00:00
Dan Sandler
fcd7fae5e6
Don't crash onServiceDisconnected...
...
...if destroy() hasn't already been called through some
other codepath.
Bug: 65249720
Test: runtest -x core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java
Change-Id: I5f90548e437986d8585390578f4ceecd57cc3473
2017-09-25 17:43:16 -04:00
Adrian Roos
2adc263ce9
FRP: Add config flag for disabling credential FRP
...
Bug: 65258606
Test: Verify FRP still works when not disabled
Change-Id: I78e308b6eaba73c794615b1eebdbfacb334ae72f
2017-09-25 13:32:48 +02:00
