OSDN Git Service
Rubin Xu [Wed, 7 Feb 2018 22:14:48 +0000 (22:14 +0000)]
[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
Change-Id: Ibae4cb0462cfcbc2296e71849387d0c0035d3cce
Rubin Xu [Wed, 7 Feb 2018 21:59:55 +0000 (21:59 +0000)]
[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
Change-Id: Ibf8e444ab8e66a068174c30985e3056443db99fe
Android Build Merger (Role) [Wed, 7 Feb 2018 08:19:03 +0000 (08:19 +0000)]
[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
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:57 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97 am:
f097744926
Change-Id: Ic3e36a94f5c7b3cf33b8c7972fc1bd254be9a31c
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:50 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97
Change-Id: Ic3b71eb297425e9ff6d40c542aa67027317dffea
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:44 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483
Change-Id: Ie3d39f4c402d3385f45aca01059f03ef4025855f
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:37 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2
Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:22 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2
Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:15 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f
Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:09 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d
Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:02 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888
Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62
Rubin Xu [Wed, 7 Feb 2018 08:10:08 +0000 (08:10 +0000)]
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
TreeHugger Robot [Mon, 5 Feb 2018 20:47:15 +0000 (20:47 +0000)]
Merge "Update diskstats to break out code & data." into oc-mr1-dev
Shailesh Saini [Fri, 2 Feb 2018 03:57:18 +0000 (03:57 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dev am:
7de6312dde
am:
5fde1b98fb
Change-Id: Ie88ec3204c1ae169507e6a9d22024188a229b3c1
Android Build Merger (Role) [Fri, 2 Feb 2018 03:53:02 +0000 (03:53 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610 am:
abab079bf5 am:
ad47a2d85c am:
35a855de49
am:
6aa6390e71
Change-Id: I7ab0827f6109f89893ede5b8f91d19e8236a49e4
Android Build Merger (Role) [Fri, 2 Feb 2018 03:49:25 +0000 (03:49 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6 am:
389f0e5240
am:
f7b4200a5f
Change-Id: Id222c2407af4807631e3d2d588fff3c67d00d3c0
Adam Vartanian [Fri, 2 Feb 2018 03:46:04 +0000 (03:46 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev am:
36c202ed80
am:
cf31e066a9
Change-Id: I774ce7a4046548222c3a0d913bbfcc3e0759ede3
Shailesh Saini [Thu, 1 Feb 2018 23:58:25 +0000 (23:58 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dev
am:
7de6312dde
Change-Id: I8823151ab194dab137c8f8632e59ad67210379fc
Android Build Merger (Role) [Thu, 1 Feb 2018 23:53:22 +0000 (23:53 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610 am:
abab079bf5 am:
ad47a2d85c
am:
35a855de49
Change-Id: I2c50c4a78bc670e13c5a7bd4f9fec078fb7d40a9
Android Build Merger (Role) [Thu, 1 Feb 2018 23:50:39 +0000 (23:50 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6
am:
389f0e5240
Change-Id: I127c7f52e2adc246784f750a4ccb1f494bbdb245
Adam Vartanian [Thu, 1 Feb 2018 23:44:18 +0000 (23:44 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev
am:
36c202ed80
Change-Id: Ieb4b5cd2cafd20d4898bc781c43e41d3bed0d7dc
Shailesh Saini [Thu, 1 Feb 2018 21:20:24 +0000 (21:20 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dev
Android Build Merger (Role) [Thu, 1 Feb 2018 14:15:00 +0000 (14:15 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610 am:
abab079bf5 am:
ad47a2d85c
Change-Id: If55b895ba0f1e937d09e405d3e6e5e91a218fd78
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:55 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610 am:
abab079bf5
Change-Id: Id4a9288f60adf16b25e8c908dba5a0b4b80efd03
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:50 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610
Change-Id: I54351ca2122f59d01ebc36377efca2c22c4a89de
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:45 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8
Change-Id: I1038ed8069ddb086c8a098d5dccddfee887b8807
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:40 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814
Change-Id: I1b8b8bdfd800c6bed1a8c3e69ef9ba81b9fe2bf2
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:27 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a
Change-Id: I964d1b8a03e24cc51b8c385d2a04c4a6a338aa36
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:22 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72
Change-Id: I982742b65d3ae6941b274c147d09ce6f50533c1e
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:17 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249
Change-Id: I1ea542611301d0c4359021303b05a5e59ee1185b
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:11 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e
Change-Id: If53ecf0654e883fa43e2f543561f0f7994763698
Adam Vartanian [Thu, 1 Feb 2018 14:13:34 +0000 (14:13 +0000)]
Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev
am:
5ed5d15e66
Change-Id: I7eb106b0db3ab568a7d8845ddd2025d80eeced3c
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:57 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6
Change-Id: Ibf20bf72eaea7cbf173e52bf8f57d81fd292a194
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:52 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5
Change-Id: I3cf57dd4a6bf94731b963602b84af31913de743d
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:46 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8
Change-Id: I63980272300f26d8ded0154fc3fb4886cb6df17e
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:40 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd
Change-Id: I506e5707bb4eb541740909d36679691f0fd8caf9
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:34 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85
Change-Id: Ib248b06c7d6a3c90020e43e04554af39918be955
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:20 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786
Change-Id: I3649d3b8bfa880ac44c88f5f6672b94877345911
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:15 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f
Change-Id: Ifd6fc978fb4544f7f4c9fe99599d472c10b071ac
Adam Vartanian [Thu, 1 Feb 2018 14:05:44 +0000 (14:05 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev
am:
fea4158eea
Change-Id: Iea20c91a29115634c2241f535c4a0c489605798f
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-mr2-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-mr1-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-dr1-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr1.5-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab am:
6b1b3c9bdc
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into cw-f-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into cw-e-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Android Build Merger (Role) [Thu, 1 Feb 2018 03:38:06 +0000 (03:38 +0000)]
[automerger] Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev am:
afb1b1aeb6 am:
753fdb8bb6 am:
542f647684
am:
687a6d23c5
Change-Id: Ia5ab8296347a9698cf2e18b80366698db40d438e
Android Build Merger (Role) [Thu, 1 Feb 2018 03:30:15 +0000 (03:30 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev am:
82db4c8b41 am:
4205b8a166
am:
723efe6935
Change-Id: Ic264904353cf9e3b184b32fc33d0d3479ad65f4e
Android Build Merger (Role) [Thu, 1 Feb 2018 03:24:13 +0000 (03:24 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev am:
46fc48f57e
am:
b39e49d52c
Change-Id: Iaf02c5ebdb656fc79cde201e6df97760283ea4e4
Android Build Merger (Role) [Thu, 1 Feb 2018 03:20:23 +0000 (03:20 +0000)]
[automerger] Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev am:
afb1b1aeb6 am:
753fdb8bb6
am:
542f647684
Change-Id: I4ca0c56badef09ee37e130f3183bd8f27b9e5947
Android Build Merger (Role) [Thu, 1 Feb 2018 03:18:27 +0000 (03:18 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev am:
82db4c8b41
am:
4205b8a166
Change-Id: Ic1f9b793f7a5836bdf7e6f3520d3ad7e90732141
Android Build Merger (Role) [Thu, 1 Feb 2018 03:13:16 +0000 (03:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev
am:
46fc48f57e
Change-Id: I85ba0993926fbd9a61525e35e411887130b3c5aa
Android Build Merger (Role) [Wed, 31 Jan 2018 22:31:31 +0000 (22:31 +0000)]
[automerger] Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev am:
afb1b1aeb6 am:
753fdb8bb6
Change-Id: I22952487835512925c3a2fe5ca2086f6b5354844
Android Build Merger (Role) [Wed, 31 Jan 2018 22:30:46 +0000 (22:30 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev
am:
82db4c8b41
Change-Id: I5c35701ddf6633063cad9ca141856b8612f7ad9b
Android Build Merger (Role) [Wed, 31 Jan 2018 22:30:44 +0000 (22:30 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev
am:
afb1b1aeb6
Change-Id: I4d2f501b942e2a7dd6c2a3415758ce76087f1b78
TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev
* changes:
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Check for null-terminator in ResStringPool::string8At
TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev
* changes:
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9 am:
5786491706
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Check for null-terminator in ResStringPool::string8At
TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev
* changes:
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Check for null-terminator in ResStringPool::string8At
Shuzhen Wang [Wed, 31 Jan 2018 21:49:57 +0000 (21:49 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev am:
5f7cdba8ab
am:
df255a4a6b
Change-Id: I273a04bfcab3b26da4bc745445d144db1a0c9419
Daniel Nishi [Fri, 15 Sep 2017 00:10:00 +0000 (17:10 -0700)]
Update diskstats to break out code & data.
This updates both the text-based diskstats and the proto-based diskstats
to both have both an aggregated and line-itemed view of app sizes.
Formerly, the code and data sizes were rolled up into the same category
and now they are separated.
Bug:
63908720
Test: FrameworksServicesTest passes
Merged-In: I1434327ffde6ad1f31243218c5201a80f9725a63
(cherry picked from commit
b6cc838142d2390eaec99670bb6caf6bee0ec96f)
Shuzhen Wang [Wed, 31 Jan 2018 21:28:00 +0000 (21:28 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
am:
5f7cdba8ab
Change-Id: Ic55969e029228542f79e870cb7b5c68602b9a084
TreeHugger Robot [Wed, 31 Jan 2018 21:11:32 +0000 (21:11 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
Jakub Pawlowski [Fri, 8 Dec 2017 06:56:03 +0000 (22:56 -0800)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
Bug:
69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Merged-In: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Android Build Merger (Role) [Wed, 31 Jan 2018 11:21:07 +0000 (11:21 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab am:
6b1b3c9bdc
Change-Id: Iceaaaec271c590da862e65002396222aab9219e8
Android Build Merger (Role) [Wed, 31 Jan 2018 11:21:02 +0000 (11:21 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab
Change-Id: I09260b353e45dac4c59b920b0166d40b3eb810aa
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:55 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
Change-Id: Ie23e4a58c906b1afe4e47e915251d44c628c9a72
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:48 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
Change-Id: Ib4cb67450dcb8e35693030d77e2ec815d23275d1
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:41 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
Change-Id: Ieddabe1b12f34bd7632ce893ef4e0c298f5c44df
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:28 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
Change-Id: Ia7b1157fb7f2066e26dc82ec703f39cd9fa69fd7
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:21 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
Change-Id: If07298bb4ecf8a55391a014568a3ea264358b0e9
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:15 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
Change-Id: I3fd20a3ee5eaa6be1c1989f13d40aed34136557e
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:08 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
Change-Id: Ic336b5fafebabdd4a5ad4d775a96d76739189a09
Android Build Merger (Role) [Wed, 31 Jan 2018 11:19:56 +0000 (11:19 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Change-Id: I20336a5786e753e6941b9a784068480475415110
Adam Vartanian [Wed, 31 Jan 2018 11:05:10 +0000 (11:05 +0000)]
Adjust URI host parsing to stop on \ character.
The WHATWG URL parsing algorithm [1] used by browsers says that for
"special" URL schemes (which is basically all commonly-used
hierarchical schemes, including http, https, ftp, and file), the host
portion ends if a \ character is seen, whereas this class previously
continued to consider characters part of the hostname. This meant
that a malicious URL could be seen as having a "safe" host when viewed
by an app but navigate to a different host when passed to a browser.
[1] https://url.spec.whatwg.org/#host-state
Bug:
71360761
Test: vogar frameworks/base/core/tests/coretests/src/android/net/UriTest.java (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Id53f7054d1be8d59bbcc7e219159e59a2425106e
Svetoslav Ganov [Wed, 31 Jan 2018 01:55:49 +0000 (01:55 +0000)]
Merge "Use correct user id for permission check for instant foreground service" into oc-mr1-dev
Jon Dormody [Mon, 29 Jan 2018 21:04:50 +0000 (21:04 +0000)]
Merge "Docs: Changed "the value of an item that previously added with putExtra()" to "the value of an item previously added with putExtra(),"" into oc-mr1-dev
Jon Dormody [Mon, 29 Jan 2018 19:23:32 +0000 (19:23 +0000)]
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev
Jon Dormody [Mon, 29 Jan 2018 19:23:15 +0000 (19:23 +0000)]
Merge "Docs: Added a link to the Motion Sensor docs for information on gravity values and calculating alpha. Test: make ds-docs Bug:
6442659" into oc-mr1-dev
Ricardo Loo Foronda [Thu, 25 Jan 2018 16:42:43 +0000 (08:42 -0800)]
Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member
Status: Ready for review
Note: This is a Javadoc only change.
Changes: Removed unnecessary "(TODO)" note.
Test: Build the docs with "make ds-docs" and staged updated content.
Staged content:
go/dac-stage/reference/android/app/Notification.html#FLAG_SHOW_LIGHTS
Bug:
20150478
Change-Id: I3a7fc0414ccb6f52e9b4919031a93ca1a7a29336
Ricardo Loo Foronda [Mon, 29 Jan 2018 04:04:09 +0000 (04:04 +0000)]
Merge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev
Ricardo Loo Foronda [Mon, 29 Jan 2018 02:27:48 +0000 (02:27 +0000)]
Merge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev
TreeHugger Robot [Sun, 28 Jan 2018 06:49:19 +0000 (06:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 27 Jan 2018 17:32:17 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 27 Jan 2018 01:50:20 +0000 (17:50 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7539ffdd87c19fc7dfd694dacd78f62fbec10397
Jonathan Dormody [Thu, 11 Jan 2018 20:18:59 +0000 (13:18 -0700)]
Docs: Added a link to the Motion Sensor docs for information on gravity
values and calculating alpha.
Test: make ds-docs
Bug:
6442659
Change-Id: Ifbb58526d01894c4c7570596348a8bd3e5c9eb4f
Jonathan Dormody [Wed, 15 Nov 2017 21:10:57 +0000 (14:10 -0700)]
Docs: Changed "the value of an item that previously added with
putExtra()" to "the value of an item previously added with putExtra(),"
Test: make ds-docs
Bug:
1429953
Change-Id: Ided080aea7686e7a711376fa380c41027b71b1d3
TreeHugger Robot [Fri, 26 Jan 2018 20:54:50 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:46 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:41 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:03 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:52:07 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:37 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:33 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Hyunyoung Song [Tue, 27 Jun 2017 23:56:41 +0000 (16:56 -0700)]
AdaptiveIconDrawable should not update layer bounds when bound is empty
Test: build succeeds. Also, setting tint mode does not result in error.
Bug:
37682281
Bug:
69969749
Change-Id: I5991b8e58514a2130a793a5edb90baeafae9b148
Svet Ganov [Thu, 7 Dec 2017 07:45:38 +0000 (23:45 -0800)]
Use correct user id for permission check for instant foreground service
Test: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
-t android.appsecurity.cts.EphemeralTest#testStartForegrondService
bug:
68275646
Bug:
71366502
Change-Id: I196522c49ae8a7e0ec07bf631f04bae51e96db5b
cherry pick from: https://android-review.googlesource.com/c/platform/frameworks/base/+/559340
(cherry picked from commit
e32c238ce76151dd6221e6762f841c8f721c45f7)
Change-Id: Idfeae038d42b9dee9f6f57203f2bdb0764f51877