Alan Viverette
60a7e5c442
Merge changes from topic "viewpager_state" into nyc-mr2-dev
...
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667caebf5c06dfd04ccc6608187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667caebf5c06df187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667c187964aca14c24e4d831fece305de0cb362192e8bc42f76941187964aca14c24e4d831fece305de0cb362192e8187964aca14c24e4d831fece305de0187964aca14c24e4d831187964aca1
2018-03-09 18:43:02 +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)
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
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
Michael Plass
02d802e71e
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result
...
Bug: 62866191
Bug: 63074860
Bug: 65267749
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit 56e46134d39c1d56576e
2017-09-01 09:42:27 -07:00
Nick Kralevich
ce8a0dea71
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6 am: 3946a75cb3
...
am: 3c529012d3
2017-05-23 00:39:49 +00:00
Nick Kralevich
fdf1fdfc1b
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a am: 02f0044d98
...
am: 6cadbad153
2017-05-23 00:38:33 +00:00
Nick Kralevich
3c529012d3
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6
...
am: 3946a75cb3
2017-05-23 00:25:35 +00:00
Nick Kralevich
6cadbad153
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a
...
am: 02f0044d98
2017-05-23 00:24:33 +00:00
Nick Kralevich
3946a75cb3
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446
...
am: 5f4382e2a6
2017-05-23 00:18:31 +00:00
Nick Kralevich
02f0044d98
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f
...
am: dc87ac995a
2017-05-23 00:17:22 +00:00
Nick Kralevich
5f4382e2a6
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519
...
am: a07389b446
2017-05-23 00:07:43 +00:00
Nick Kralevich
dc87ac995a
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee
...
am: 12c5f0da9f
2017-05-23 00:06:55 +00:00
Nick Kralevich
a07389b446
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413
...
am: 7a06357519
2017-05-22 23:51:48 +00:00
Nick Kralevich
12c5f0da9f
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31
...
am: 5bfe82c3ee
2017-05-22 23:50:57 +00:00
Nick Kralevich
7a06357519
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9
...
am: 66a08a5413
2017-05-22 23:36:12 +00:00
Nick Kralevich
5bfe82c3ee
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af
...
am: 7fd2d8ea31
2017-05-22 23:35:04 +00:00
Nick Kralevich
66a08a5413
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab
...
am: 55c8a1ede9
2017-05-22 23:19:09 +00:00
Nick Kralevich
7fd2d8ea31
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d
...
am: 982b8018af
2017-05-22 23:18:24 +00:00
Nick Kralevich
55c8a1ede9
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39
...
am: 47beaa8fab
2017-05-22 23:02:54 +00:00
Nick Kralevich
982b8018af
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2
...
am: f5bd84b82d
2017-05-22 23:02:13 +00:00
Nick Kralevich
47beaa8fab
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8
...
am: 8965cd6a39
2017-05-22 22:46:18 +00:00
Nick Kralevich
f5bd84b82d
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973
...
am: c46889e2d2
2017-05-22 22:45:44 +00:00
Nick Kralevich
8965cd6a39
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c
...
am: 1cc9ec47c8
2017-05-22 22:24:39 +00:00
Nick Kralevich
c46889e2d2
system_server: add CAP_SYS_PTRACE am: 966619d0ab
...
am: b8d972e973
2017-05-22 22:23:47 +00:00
Nick Kralevich
1cc9ec47c8
ZygoteInit: Remove CAP_SYS_RESOURCE
...
am: 4911af2b8c
2017-05-22 22:05:18 +00:00
Nick Kralevich
b8d972e973
system_server: add CAP_SYS_PTRACE
...
am: 966619d0ab
2017-05-22 22:04:57 +00:00
Nick Kralevich
4911af2b8c
ZygoteInit: Remove CAP_SYS_RESOURCE
...
Please see commit 3082eb7c7235775783fc
2017-05-22 12:19:29 -07:00
Nick Kralevich
966619d0ab
system_server: add CAP_SYS_PTRACE
...
Commit https://android.googlesource.com/kernel/common/+/f0ce0eee added
CAP_SYS_RESOURCE as a capability check which would allow access to
sensitive /proc/PID files. system_server uses this capability to collect
smaps from managed processes. Presumably this was done to avoid the
implications of granting CAP_SYS_PTRACE to system_server.
However, with SELinux enforcement, we can grant CAP_SYS_PTRACE but not
allow ptrace attach() to other processes. The net result of this is that
CAP_SYS_PTRACE and CAP_SYS_RESOURCE have identical security controls, as
long as system_server:process ptrace is never granted.
Add CAP_SYS_PTRACE to the set of capabilities granted to system_server.
Don't delete CAP_SYS_RESOURCE for now. SELinux has blocked the use of
CAP_SYS_RESOURCE, but we still want to generate audit logs if it's
triggered. CAP_SYS_RESOURCE can be deleted in a future commit.
Bug: 34951864
Bug: 38496951
Test: Device boots, functionality remains identical, no sys_resource
denials from system_server.
Change-Id: I2570266165396dba2b600eac7c42c94800d9c65b
(cherry picked from commit 3082eb7c72
2017-05-22 11:28:48 -07:00
Andrew Zeng
aa448d0290
DO NOT MERGE Notify keyguard of when power button is pressed.
...
This is done on wear power button doesn't turn off the screen,
when the device wakes from keyguard UI isn't visible yet, so
it needs to react to power press in some way.
Bug: 35147955
Change-Id: I22619ea446770d09b53370e9244215646b60a9db
2017-04-13 18:26:21 -07:00
