Jim Miller
85c390e9fb
Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2
...
am: 9f04985991
2016-08-19 20:16:34 +00:00
Jim Miller
9f04985991
Bind fingerprint when we start authentication - DO NOT MERGE
...
am: b6f4b48df2
2016-08-19 20:09:41 +00:00
Jim Miller
b6f4b48df2
Bind fingerprint when we start authentication - DO NOT MERGE
...
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.
Fixes bug 30744668
Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
2016-08-19 03:46:40 +00:00
Christopher Tate
6ea7b630c2
DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107
...
am: aac7d0442c
2016-08-10 17:44:50 +00:00
Christopher Tate
aac7d0442c
DO NOT MERGE: Backport N backup/restore stability work to M
...
am: d6f3a11107
2016-08-10 17:28:28 +00:00
Christopher Tate
d6f3a11107
DO NOT MERGE: Backport N backup/restore stability work to M
...
This is a squashed rollup of backup/restore infrastructural work in
the N release. It intentionally omits semantic/API changes such
as the introduction of the onQuotaExceeded() callback.
This patchset should not be merged beyond M maintenance releases.
Bug 29617908
Bug 29848715
Change-Id: I1eb25ad07f3bbf1132198d8a233722c41f1ac4cc
2016-08-08 10:48:26 -07:00
fionaxu
e5643a13c4
Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893
...
am: 69a071e55c
2016-07-06 23:36:00 +00:00
Chen Xu
69a071e55c
Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am: d2e2288fe3
...
am: 59fc768893
2016-07-06 23:29:51 +00:00
fionaxu
59fc768893
Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
...
am: d2e2288fe3
2016-07-06 23:24:04 +00:00
fionaxu
99973d9852
DO NOT MERGE revert system api loadSafeLabel
...
Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
2016-06-30 17:57:46 -07:00
Christopher Tate
d2a4e1b39c
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab
...
am: e2c9b1af3e
2016-06-17 00:24:29 +00:00
Christopher Tate
e2c9b1af3e
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
...
am: d6c1126fab
2016-06-17 00:18:48 +00:00
Christopher Tate
d6c1126fab
resolve merge conflicts of cffb19c to mnc-dev
...
am: 3f9ea2d386
2016-06-17 00:15:07 +00:00
Christopher Tate
3f9ea2d386
resolve merge conflicts of cffb19c to mnc-dev
...
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
2016-06-16 16:31:39 -07:00
Christopher Tate
cffb19c812
Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7
...
am: ec6c3f7a32
2016-06-16 22:30:17 +00:00
Christopher Tate
ec6c3f7a32
Don\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f
...
am: cd777e95a7
2016-06-16 22:27:04 +00:00
Christopher Tate
cd777e95a7
Don\'t trust callers to supply app info to bindBackupAgent()
...
am: c58054f25f
2016-06-16 22:21:37 +00:00
Christopher Tate
c58054f25f
Don't trust callers to supply app info to bindBackupAgent()
...
Get the canonical identity and metadata about the package from the
Package Manager at time of usage rather than rely on the caller to
have gotten things right, even when the caller has the system uid.
Bug 28795098
Change-Id: I215786bc894dedf7ca28e9c80cefabd0e40ca877
2016-06-14 13:28:43 -07:00
Erik Wolsheimer
eae242cfe8
Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev
2016-06-09 03:25:43 +00:00
fionaxu
afed6f8631
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 am: c95d552de0
...
am: c10e4fae05
2016-06-08 18:24:16 +00:00
fionaxu
c10e4fae05
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
...
am: c95d552de0
2016-06-08 18:11:09 +00:00
fionaxu
c95d552de0
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c
...
am: 698e044717
2016-06-08 17:23:27 +00:00
fionaxu
698e044717
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
...
am: 965084dd0c
2016-06-08 17:11:49 +00:00
fionaxu
965084dd0c
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
...
am: 1e8fe12f4e
2016-06-08 17:04:09 +00:00
fionaxu
1e8fe12f4e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
am: c196526f8e
2016-06-08 16:58:13 +00:00
fionaxu
c196526f8e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
2016-06-07 22:01:19 -07:00
fionaxu
2c53526b4b
Backport loadSafeLabel changes am: be2865a60a am: 4c50846519
...
am: 9a825b0fd5
2016-06-07 23:23:10 +00:00
fionaxu
9a825b0fd5
Backport loadSafeLabel changes am: be2865a60a
...
am: 4c50846519
2016-06-07 23:20:04 +00:00
fionaxu
4c50846519
Backport loadSafeLabel changes
...
am: be2865a60a
2016-06-07 23:13:08 +00:00
fionaxu
be2865a60a
Backport loadSafeLabel changes
...
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
2016-06-07 22:51:28 +00:00
Erik Wolsheimer
2379796e11
DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.
...
CP of 377ded0fce
2016-06-06 10:49:02 -07:00
Paul Jensen
94c8855da6
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3
...
am: 7ff57eaff9
2016-05-26 15:22:55 +00:00
Paul Jensen
7ff57eaff9
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb
...
am: a5a2c88fb3
2016-05-26 15:13:07 +00:00
Paul Jensen
a5a2c88fb3
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938
...
am: 54a62d5feb
2016-05-26 15:02:46 +00:00
Paul Jensen
54a62d5feb
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02
...
am: 7c625e1938
2016-05-26 14:50:37 +00:00
Paul Jensen
7c625e1938
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364
...
am: 75095e6f02
2016-05-26 14:35:08 +00:00
Paul Jensen
75095e6f02
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434
...
am: 42a5983364
2016-05-26 14:13:16 +00:00
Paul Jensen
42a5983364
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141
...
am: 6c35cf2434
2016-05-26 14:01:19 +00:00
Paul Jensen
6c35cf2434
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff
...
am: bb27626141
2016-05-26 13:44:37 +00:00
Paul Jensen
bb27626141
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff
...
am: 8940d2b0ff
2016-05-26 13:37:24 +00:00
Paul Jensen
8940d2b0ff
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
...
am: af0b4466ff
2016-05-26 13:30:59 +00:00
Paul Jensen
08ec0e53b8
Don't pass URL path and username/password to PAC scripts
...
The URL path could contain credentials that apps don't want exposed
to a potentially malicious PAC script.
Bug: 27593919
Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed
2016-04-29 10:57:13 +00:00
Michael Wright
bc57aaed0e
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd
...
am: a8064c2
2016-04-18 18:57:54 +00:00
Michael Wright
a8064c2a8b
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e
...
am: c6629bd
2016-04-18 18:52:13 +00:00
Michael Wright
c6629bd5df
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev
...
am: 224582e
* commit '224582e0403bb123da49d80af21f108900185769':
Add new, hidden MotionEvent flag for partially obscured windows.
Change-Id: I24f2bf328c91bbc05f1b76ed464d962c71e92245
2016-04-18 18:46:44 +00:00
Michael Wright
224582e040
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev
2016-04-18 18:40:19 +00:00
Todd Kennedy
7b068fa903
DO NOT MERGE Fix intent filter priorities am: eeb970a am: cd24c4e
...
am: bd770bc
2016-04-11 22:12:05 +00:00
Todd Kennedy
ca133845ef
DO NOT MERGE Fix intent filter priorities am: 60351d3
...
am: 3dfc6d9
2016-04-11 22:06:38 +00:00
Todd Kennedy
bd770bc97b
DO NOT MERGE Fix intent filter priorities am: eeb970a
...
am: cd24c4e
2016-04-11 22:06:35 +00:00
Todd Kennedy
3dfc6d986f
DO NOT MERGE Fix intent filter priorities
...
am: 60351d3
2016-04-11 22:00:27 +00:00
