Fyodor Kupolov
d50b61ff36
Merge \\"Use granted userId to look up provider info\\" into nyc-dev am: f9f2c7ceef
...
am: 7bc1db96ed
2016-06-22 22:47:46 +00:00
Fyodor Kupolov
7bc1db96ed
Merge \"Use granted userId to look up provider info\" into nyc-dev
...
am: f9f2c7ceef
2016-06-22 22:41:42 +00:00
Fyodor Kupolov
f9f2c7ceef
Merge "Use granted userId to look up provider info" into nyc-dev
2016-06-22 22:28:38 +00:00
Adam Lesinski
ce71c120df
Merge \\"ContextImpl: Keep DisplayAdjustments and Display in sync\\" into nyc-dev am: 0bf31c3fa6
...
am: a72a6aae37
2016-06-22 19:27:30 +00:00
Adam Lesinski
a72a6aae37
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
...
am: 0bf31c3fa6
2016-06-22 19:17:43 +00:00
Adam Lesinski
e894efa9b6
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
...
am: 0bf31c3fa6
2016-06-22 19:16:44 +00:00
Fyodor Kupolov
9bbaacf845
Use granted userId to look up provider info
...
In getPersistedUriPermissions, use granted userId instead of the calling
userId to look up provider info.
Bug: 29058113
Change-Id: Ia637be414f9ef3b8e9bce13bb56bd335cfb28ac7
2016-06-22 10:31:18 -07:00
Adam Lesinski
4ece3d6bb1
ContextImpl: Keep DisplayAdjustments and Display in sync
...
Make sure that when our Resources get updated, that DisplayAdjustment
and Display properly reflect the potentially new screen dimensions.
Bug:28388969
Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3
2016-06-21 17:55:58 -07:00
Makoto Onuki
5665a66b44
Merge \"Shortcut Manager: Address API council feedback and fix TODOs\" into nyc-mr1-dev
...
am: 3c67b3e47c
2016-06-21 23:50:32 +00:00
Makoto Onuki
3c67b3e47c
Merge "Shortcut Manager: Address API council feedback and fix TODOs" into nyc-mr1-dev
2016-06-21 23:35:16 +00:00
Makoto Onuki
b5a012fd6f
Shortcut Manager: Address API council feedback and fix TODOs
...
Bug 29515722
Bug 29516909
Bug 29515090
Bug 29516954
Bug 29515088
Change-Id: Ibe1d27033cbd0fd50d37e3d9945b47551211c568
2016-06-21 14:42:48 -07:00
Todd Kennedy
322bb3fd0a
Merge \"Change prefix based upon mask\" into nyc-mr1-dev
...
am: 1dffcfdd7b
2016-06-21 18:54:15 +00:00
Todd Kennedy
409b0a13e1
Change prefix based upon mask
...
The mask may not be all F's.
Change-Id: I50ff4e4fb95af2037b84a1531b60dd9c0986bf86
2016-06-21 09:42:08 -07:00
Makoto Onuki
c07a7518d6
Merge \"Launcher shortcut callback should deliver manifest shortcuts too\" into nyc-mr1-dev
...
am: 901c03faba
2016-06-20 21:15:26 +00:00
Makoto Onuki
901c03faba
Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-dev
2016-06-20 21:06:42 +00:00
Roozbeh Pournader
e7978c11c8
Merge \"Fix AAPT-compatible output format for locales\" into nyc-mr1-dev
...
am: 63ed39f395
2016-06-20 19:27:50 +00:00
Roozbeh Pournader
63ed39f395
Merge "Fix AAPT-compatible output format for locales" into nyc-mr1-dev
2016-06-20 19:22:27 +00:00
Todd Kennedy
fcb121216c
Merge \"fix resolver\" into nyc-mr1-dev
...
am: acc21f572d
2016-06-20 19:06:15 +00:00
TreeHugger Robot
acc21f572d
Merge "fix resolver" into nyc-mr1-dev
2016-06-20 18:45:04 +00:00
Todd Kennedy
958b3410bf
fix resolver
...
Change-Id: I31649d0f85b7b6553a6ecf38fd7c08279b85a0a6
2016-06-20 10:06:06 -07:00
Makoto Onuki
4d6b87ffdf
Launcher shortcut callback should deliver manifest shortcuts too
...
- Also include "activity" in the key fields, as this is now an
important field.
- Also optimize ShortcutInfo parceling for the "key field only" case.
Bug 29394043
Bug 29451629
Change-Id: I61b2bc2f61ad6ebdcbaf6d02f1bd88777c45a7f0
2016-06-20 09:28:05 -07:00
Roozbeh Pournader
309ebd6430
Fix AAPT-compatible output format for locales
...
The previous code used a format that is not supported by AAPT,
although it claimed it was. The new code generates locale codes in
the format AAPT can consume, using xx and xx-rYY for simple locales,
and the b+ format for everything else.
Bug: 25599046
Change-Id: I34d432f23b84913d313d6562c110d7fad87c457a
2016-06-17 22:24:54 -07:00
Makoto Onuki
5a533c9ae3
Merge \"Update manifest shortcut XML schema\" into nyc-mr1-dev
...
am: a65d8b6609
2016-06-17 20:40:16 +00:00
Makoto Onuki
a65d8b6609
Merge "Update manifest shortcut XML schema" into nyc-mr1-dev
2016-06-17 20:29:38 +00:00
Makoto Onuki
df6da040e0
Update manifest shortcut XML schema
...
Use the standard <intent> tag instead of custom tags.
- Also fix setDynamicShortcuts(), which was broken in the previous CL.
- Also tolerate runtime exceptions while parsing XMLs
- Also fix b/29422018 while I'm at it
Bug 29390156
Bug 29077932
Bug 29422018
Change-Id: I2756c9d66c6d7b2962a982d9e57a7d84a5755b28
2016-06-17 11:51:20 -07:00
Gina Dimino
cb08f6805a
Merge \\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\" into nyc-dev am: d06520a488
...
am: b7181150c4
2016-06-16 21:13:04 +00:00
Gina Dimino
b7181150c4
Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
...
am: d06520a488
2016-06-16 21:08:17 +00:00
Gina Dimino
0bae4dcd76
Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
...
am: d06520a488
2016-06-16 21:08:15 +00:00
Gina Dimino
d06520a488
Merge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev
2016-06-16 21:02:14 +00:00
Makoto Onuki
58b2258506
Merge \"Shortcut: Reset throttling upon inline reply\" into nyc-mr1-dev
...
am: 489bafbb4b
2016-06-16 17:10:42 +00:00
Makoto Onuki
489bafbb4b
Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev
2016-06-16 17:05:55 +00:00
Amith Yamasani
80027e9d93
Merge \\"More thorough cleansing of expired users\\" into nyc-dev am: 4f2b1b455e
...
am: bf1301f542
2016-06-16 00:28:45 +00:00
Amith Yamasani
bf1301f542
Merge \"More thorough cleansing of expired users\" into nyc-dev
...
am: 4f2b1b455e
2016-06-16 00:24:17 +00:00
Amith Yamasani
c5ffdb9ee4
Merge \"More thorough cleansing of expired users\" into nyc-dev
...
am: 4f2b1b455e
2016-06-16 00:24:14 +00:00
Makoto Onuki
35f77b2b74
Merge \"ShortcutManger: Auto-adjust ranks.\" into nyc-mr1-dev
...
am: 70a91541e9
2016-06-15 21:59:09 +00:00
Makoto Onuki
70a91541e9
Merge "ShortcutManger: Auto-adjust ranks." into nyc-mr1-dev
2016-06-15 21:44:58 +00:00
Makoto Onuki
9e1f5595bd
ShortcutManger: Auto-adjust ranks.
...
Spec: go/shortcutmanager-spec-ranks
Bug 28984376
Bug 28536066
Change-Id: Ibffb92233c62792af06eeadc5a9a6379d0506a3c
2016-06-15 14:24:44 -07:00
Amith Yamasani
d04aaa323c
More thorough cleansing of expired users
...
If any /data/system_[c|d]e folders were not erased
when the user was removed (maybe due to a reboot),
make sure they're cleaned up on restart as well
as when the userId is recycled later.
Mark the users' system folders with the correct
serial number for later verification.
AccountManager shouldn't be querying accounts of
partially created/destroyed users.
Change-Id: I4313756b7464f34cd5ce4fb296d61daa50b41fcb
Fixes: 29285673
2016-06-15 11:32:16 -07:00
Todd Kennedy
162b74a6fd
Merge \"New API w/ multiple prefixes\" into nyc-mr1-dev
...
am: d07b87cb1c
2016-06-15 00:03:12 +00:00
Todd Kennedy
a97045b245
New API w/ multiple prefixes
...
Use the new API that contains multiple hash prefixes and a mask. Also
do some small refactoring necessary to handle multiple prefixes and
use a common implementation of the hash generation
Change-Id: Ib52f767ea6aadc30c67c5bdee949e9f9c5f04e44
2016-06-14 16:01:05 -07:00
Makoto Onuki
d6e1f3bec1
Shortcut: Reset throttling upon inline reply
...
When the user does an "inline reply", we consider the notification
publisher app is "activated" and reset the shortcut throttling.
Bug 28705275
Change-Id: Ic9ffa13635274ead7e9d1e832cd31dea997830aa
2016-06-14 14:12:07 -07:00
Makoto Onuki
31a5d3affa
Merge \\"Push DO/PO package names from DPMS to PM\\" into nyc-dev am: f419bd9e03
...
am: 93322e6818
2016-06-13 22:30:20 +00:00
Makoto Onuki
93322e6818
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
...
am: f419bd9e03
2016-06-13 22:17:10 +00:00
Makoto Onuki
78f16950c6
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
...
am: f419bd9e03
2016-06-13 21:23:18 +00:00
Makoto Onuki
f419bd9e03
Merge "Push DO/PO package names from DPMS to PM" into nyc-dev
2016-06-13 21:16:29 +00:00
Andreas Gampe
cda39b3af7
Merge \"Otadexopt: Expose progress percentage\" into nyc-mr1-dev
...
am: b71c36b000
2016-06-13 16:58:06 +00:00
TreeHugger Robot
b71c36b000
Merge "Otadexopt: Expose progress percentage" into nyc-mr1-dev
2016-06-13 16:52:18 +00:00
Makoto Onuki
1c14929ae8
Merge \"Fix some exception messages and enhance unit tets\" into nyc-mr1-dev
...
am: 5b8f5fd38b
2016-06-13 16:39:46 +00:00
Makoto Onuki
5b8f5fd38b
Merge "Fix some exception messages and enhance unit tets" into nyc-mr1-dev
2016-06-13 16:28:32 +00:00
Makoto Onuki
a1d38b3c95
Fix some exception messages and enhance unit tets
...
Bug 29275393
Change-Id: Idaa8564d41f86de2a2cbefa4ff3c08b89a3a6dd2
2016-06-10 15:32:26 -07:00
