Philip P. Moltmann
ce8a7cde53
Merge "Make sure PrintDocumentInfo is always sane." into nyc-dev am: 4f05eb1
...
am: 2d96165
* commit '2d9616511af40a6b100e1330e581bb4949018db3':
Make sure PrintDocumentInfo is always sane.
Change-Id: I3c7f84b706e8229b494f9c801ab9349f0ceca9ec
2016-04-01 17:02:57 +00:00
Philip P. Moltmann
1d926b268d
Merge "Make sure PrintAttributes have sane values." into nyc-dev am: c0e237f
...
am: 7a505ec
* commit '7a505ec7a72c463b845a5117eca865d04eb508cf':
Make sure PrintAttributes have sane values.
Change-Id: Idcd96c33e03c2d1dc06499940aa0dd247762c6f1
2016-04-01 17:02:54 +00:00
Philip P. Moltmann
2d9616511a
Merge "Make sure PrintDocumentInfo is always sane." into nyc-dev
...
am: 4f05eb1
* commit '4f05eb194cf3f2c7c518d643d29906d4c7d246de':
Make sure PrintDocumentInfo is always sane.
Change-Id: I48ac9dce7a84a9926b3756f0f190d05799ffdaad
2016-04-01 16:58:36 +00:00
Philip P. Moltmann
7a505ec7a7
Merge "Make sure PrintAttributes have sane values." into nyc-dev
...
am: c0e237f
* commit 'c0e237f63db1936da1ec0f39cf4026ae174d1525':
Make sure PrintAttributes have sane values.
Change-Id: I34bfe24d13ebbe45edd9a4b1d6bfcee8b121eda1
2016-04-01 16:58:33 +00:00
Philip P. Moltmann
4f05eb194c
Merge "Make sure PrintDocumentInfo is always sane." into nyc-dev
2016-04-01 16:49:31 +00:00
Philip P. Moltmann
c0e237f63d
Merge "Make sure PrintAttributes have sane values." into nyc-dev
2016-04-01 16:48:57 +00:00
Russell Brenner
ad85c7be86
Merge "Add new protection level for setup wizard" into nyc-dev am: 3ccb354
...
am: 395db24
* commit '395db247fb8e1273fcc9d15e7821033477ca4e6c':
Add new protection level for setup wizard
Change-Id: Ic6287b5bdaa66ffd4cfdc094329557ba12afd6a3
2016-04-01 16:36:31 +00:00
Russell Brenner
395db247fb
Merge "Add new protection level for setup wizard" into nyc-dev
...
am: 3ccb354
* commit '3ccb35421d642e96048d5cdeb60043634933267d':
Add new protection level for setup wizard
Change-Id: Ib88a868f214d1502538f544b1b5d8c5a8551b78d
2016-04-01 16:32:11 +00:00
Clara Bayarri
1e9681c51b
Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev am: 032a76f
...
am: ceeab49
* commit 'ceeab499ac86c16b2b8b53adc713b9796b79961c':
Remove unused import for KeyboardShortcutGroup
Change-Id: I4119335e332e8c702878a2c734a2d73a9bb19645
2016-04-01 16:31:21 +00:00
Clara Bayarri
ceeab499ac
Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev
...
am: 032a76f
* commit '032a76f94b457d255ebc0895bc1d8f3c0b6d8e31':
Remove unused import for KeyboardShortcutGroup
Change-Id: Id69c4c923a3456857d73a2c21a27be962378bd12
2016-04-01 16:27:01 +00:00
Russell Brenner
3ccb35421d
Merge "Add new protection level for setup wizard" into nyc-dev
2016-04-01 16:22:49 +00:00
Clara Bayarri
032a76f94b
Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev
2016-04-01 16:18:28 +00:00
Adam Powell
1d248ebb74
Merge "Revert "Only call Drawable.setVisible(false) for visible outgoing drawables"" into nyc-dev am: 991989f
...
am: 6823bc1
* commit '6823bc1a0adacf4cf9949f2e807a55f38c5313f0':
Revert "Only call Drawable.setVisible(false) for visible outgoing drawables"
Change-Id: Ib27f1998b128fca14847b13d674bd1aeeb65ae4c
2016-04-01 15:51:50 +00:00
Adam Powell
6823bc1a0a
Merge "Revert "Only call Drawable.setVisible(false) for visible outgoing drawables"" into nyc-dev
...
am: 991989f
* commit '991989f3183195cdadf308450eff8b3e9266fdab':
Revert "Only call Drawable.setVisible(false) for visible outgoing drawables"
Change-Id: I442d2f712f25dec0702662950614fb75f0b7b2e6
2016-04-01 15:47:35 +00:00
Adam Powell
991989f318
Merge "Revert "Only call Drawable.setVisible(false) for visible outgoing drawables"" into nyc-dev
2016-04-01 15:41:04 +00:00
Kenny Guy
8bd03c9509
Merge "Allow PO to check if it is in a managed profile." into nyc-dev am: fa7b672
...
am: 5ad78db
* commit '5ad78dbd4c4722ab1e1836183bec08f4f85c2b29':
Allow PO to check if it is in a managed profile.
Change-Id: I8c198bf17c484fee5407341181a4750f8a17fde9
2016-04-01 14:33:20 +00:00
Todd Kennedy
34010044ea
Merge "Allow retrieving info /system components" into nyc-dev am: 0242467
...
am: 320e7ef
* commit '320e7ef2b2468a3e00ebda557f3756cc94e713d6':
Allow retrieving info /system components
Change-Id: I7640bdf4734a8a859c55aac78fe2655a3eae4a3c
2016-04-01 14:33:16 +00:00
Kenny Guy
5ad78dbd4c
Merge "Allow PO to check if it is in a managed profile." into nyc-dev
...
am: fa7b672
* commit 'fa7b6723e6fae582bc4948394b06c0f88dc1baa3':
Allow PO to check if it is in a managed profile.
Change-Id: I3ae227f65db8deb6a2dc622f91807538aa164c4c
2016-04-01 14:29:00 +00:00
Todd Kennedy
320e7ef2b2
Merge "Allow retrieving info /system components" into nyc-dev
...
am: 0242467
* commit '02424676c68e23f44432ef0e379d65ddd9c3a786':
Allow retrieving info /system components
Change-Id: I8f393a21d61b0f3ef9cdf4a2ebe7760412d17114
2016-04-01 14:28:56 +00:00
Kenny Guy
fa7b6723e6
Merge "Allow PO to check if it is in a managed profile." into nyc-dev
2016-04-01 14:23:51 +00:00
Todd Kennedy
02424676c6
Merge "Allow retrieving info /system components" into nyc-dev
2016-04-01 14:21:21 +00:00
Clara Bayarri
89203de878
Remove unused import for KeyboardShortcutGroup
...
Left it in accidentally when removing default method.
Change-Id: I6af0712624ffaefff4cb4ad2a9e5a86d7104d2e7
2016-04-01 14:40:34 +01:00
Gustav Sennton
291a8ce75b
Add system api to reach WebViewUpdateService Binder interface. am: 1c177d8
...
am: 8dcd93f
* commit '8dcd93f42018d853f98a96ff09d05bedbab1b438':
Add system api to reach WebViewUpdateService Binder interface.
Change-Id: I1e0ee08a6f830f95d7af804fd809083bf93a7bd4
2016-04-01 11:54:33 +00:00
Gustav Sennton
8dcd93f420
Add system api to reach WebViewUpdateService Binder interface.
...
am: 1c177d8
* commit '1c177d8dae45e72a4709cd023415d98544e756a3':
Add system api to reach WebViewUpdateService Binder interface.
Change-Id: I833bd044c51f309832f64f57eb80490c8e8359d9
2016-04-01 11:50:24 +00:00
Gustav Sennton
1c177d8dae
Add system api to reach WebViewUpdateService Binder interface.
...
Instead of using reflection in XTS tests we add some system-apis to
enable fetching information about webview packages.
Bug: 26381867
Change-Id: If983a01b6855e4a4c08ef0b5873304918d499b76
2016-04-01 12:39:54 +01:00
Clara Bayarri
6b8fd161fa
Merge "Keyboard Shortcuts Helper: Include all System shortcuts" into nyc-dev am: 3916bb0
...
am: 2056ec9
* commit '2056ec912e3b34fc13a9d64256cf009e0fc35d45':
Keyboard Shortcuts Helper: Include all System shortcuts
Change-Id: Icb89ece33eb7ee2de9c15fe43eb6288bdcf5577c
2016-04-01 11:29:38 +00:00
Clara Bayarri
2056ec912e
Merge "Keyboard Shortcuts Helper: Include all System shortcuts" into nyc-dev
...
am: 3916bb0
* commit '3916bb045c41bc354715cfef92bdd646f19f0570':
Keyboard Shortcuts Helper: Include all System shortcuts
Change-Id: I3b7b0d1b6140debce8f7e0bdde2bde3f06767e97
2016-04-01 11:25:42 +00:00
Clara Bayarri
3916bb045c
Merge "Keyboard Shortcuts Helper: Include all System shortcuts" into nyc-dev
2016-04-01 11:17:26 +00:00
Peng Xu
7f4cb5dfcd
Merge "Fix a few known issue in sensor framework" into nyc-dev am: 3dd991d
...
am: bdad7a4
* commit 'bdad7a488cd66c034e7cc3a24e1aca627a326248':
Fix a few known issue in sensor framework
Change-Id: Ie66c302f53b3b16bf28ac37c8652b08db9bb25e6
2016-04-01 02:03:31 +00:00
Peng Xu
bdad7a488c
Merge "Fix a few known issue in sensor framework" into nyc-dev
...
am: 3dd991d
* commit '3dd991d117585b2a4ab10cc5416c1ce199717a8f':
Fix a few known issue in sensor framework
Change-Id: Icb1f886e14740b79daf2b680029e5b7fc0084ac4
2016-04-01 01:59:43 +00:00
Peng Xu
3dd991d117
Merge "Fix a few known issue in sensor framework" into nyc-dev
2016-04-01 01:54:39 +00:00
Lorenzo Colitti
be9194115b
Merge "Honour the DHCP MTU option." into nyc-dev am: f512023
...
am: c3ab6ea
* commit 'c3ab6ea4e4bed08dc60d44c0203c4f657704b36d':
Honour the DHCP MTU option.
Change-Id: I3343cfa204c54a1060eeaba9d1496bb7dc811c3a
2016-04-01 01:02:36 +00:00
Lorenzo Colitti
c3ab6ea4e4
Merge "Honour the DHCP MTU option." into nyc-dev
...
am: f512023
* commit 'f5120236c41c47adeddf71a5f0967b12119df2cf':
Honour the DHCP MTU option.
Change-Id: I49b425431441caab06576a2ca731b9f2ac538554
2016-04-01 00:58:53 +00:00
Lorenzo Colitti
f5120236c4
Merge "Honour the DHCP MTU option." into nyc-dev
2016-04-01 00:55:08 +00:00
Russell Brenner
b23346639b
Add new protection level for setup wizard
...
Adds PROTECTION_LEVEL_SETUP, a privileged permission for use only by
the setup wizard.
Bug: 20016740
Change-Id: Ib95e349c54d5d12465bf43162975dfb628ef2434
2016-03-31 17:32:07 -07:00
Todd Kennedy
d6ee0ba579
Allow retrieving info /system components
...
Generally we return info for the latest installed package; which could
either be a built-in [i.e. on the /system partition] package or a user
updated package. In certain circumstances, we want to be able to get
the version on the /system partition regardless of whether or not the
user has updated it. We do this by passing MATCH_FACTORY_ONLY to
getPackageInfo().
Bug: 27469181
Change-Id: I8dd1d110e2d72e5c6f024812d0b5d15d8b217347
2016-03-31 15:53:45 -07:00
Adam Powell
4b2e12cc9e
Revert "Only call Drawable.setVisible(false) for visible outgoing drawables"
...
This reverts commit 35e2ea0203 .
This patch was based on two different wrong assumptions.
Bug 27822069
Change-Id: I20b1017f91f3fce3c23dd8446459d6f3e3150a48
2016-03-31 15:36:18 -07:00
Christopher Tate
8f1ebb5de3
Merge "Handle interaction of Bundle.hasFileDescriptors() with removal" into nyc-dev am: 1486557
...
am: d4306fd
* commit 'd4306fd59029a650c741bcb9a305e83e09f2a8e4':
Handle interaction of Bundle.hasFileDescriptors() with removal
Change-Id: I6a0431d4231c3aad55161fa46ccb3fb420dff3ae
2016-03-31 22:31:59 +00:00
Christopher Tate
d4306fd590
Merge "Handle interaction of Bundle.hasFileDescriptors() with removal" into nyc-dev
...
am: 1486557
* commit '1486557d10f9969ef31b65e4312bd00b1a6f02ae':
Handle interaction of Bundle.hasFileDescriptors() with removal
Change-Id: I3e1d35c5fbd6ad2356abe61309f8b6797f3fbbba
2016-03-31 22:28:32 +00:00
Chris Tate
1486557d10
Merge "Handle interaction of Bundle.hasFileDescriptors() with removal" into nyc-dev
2016-03-31 22:22:32 +00:00
Dianne Hackborn
645d355e92
Merge "(Docs only) Make battery stats process state docs more clear."
2016-03-31 20:58:17 +00:00
Christopher Tate
250985f556
Handle interaction of Bundle.hasFileDescriptors() with removal
...
Removing entries from a Bundle may change its has-FDs state, so now
induce a recheck after removals. In support of that, make the
recheck set the known state in all cases, not just in the has-FDs
case; and note that filterValues() inherently produces a result that
is known to have no FDs.
Bug 26676151
Change-Id: Ida07b77ad2046aeafb98e0b164cd571ce45d064f
2016-03-31 13:57:42 -07:00
Dianne Hackborn
475ab1b1b5
(Docs only) Make battery stats process state docs more clear.
...
Change-Id: Ib6284cb6325d4e4991a3f66f0e46508b1f94078e
2016-03-31 13:57:19 -07:00
Alex Klyubin
e89434b7c4
Merge "Remove support for DSA with SHA-512 from v2 sig verification." into nyc-dev am: 3a21805
...
am: ae10eb8
* commit 'ae10eb8f88d35d89a14a044284c012c0d648d339':
Remove support for DSA with SHA-512 from v2 sig verification.
Change-Id: I1c238d6952048357758456d3f67d00eab1076ae3
2016-03-31 20:55:21 +00:00
Alex Klyubin
ae10eb8f88
Merge "Remove support for DSA with SHA-512 from v2 sig verification." into nyc-dev
...
am: 3a21805
* commit '3a21805aa19d34b1aede3c14eab2292b0f91ee89':
Remove support for DSA with SHA-512 from v2 sig verification.
Change-Id: I37a7c268fbfc8d60ebded9c3ea6e0098c0c9610f
2016-03-31 20:52:12 +00:00
Alex Klyubin
3a21805aa1
Merge "Remove support for DSA with SHA-512 from v2 sig verification." into nyc-dev
2016-03-31 20:46:04 +00:00
George Mount
1c220b5ade
Merge "Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""" into nyc-dev am: 98aa25c
...
am: dc21c57
* commit 'dc21c57aa01d9adad60f15553423335b063c0ab4':
Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""
Change-Id: I14b1f45a7adcde076bef8369ceaf72c04110f5be
2016-03-31 20:23:47 +00:00
George Mount
dc21c57aa0
Merge "Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""" into nyc-dev
...
am: 98aa25c
* commit '98aa25c2d9c1ac2ebacef7612f5103925ff84d94':
Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""
Change-Id: I449067238317b66090e036a40181c27ec892a01d
2016-03-31 20:20:45 +00:00
George Mount
98aa25c2d9
Merge "Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""" into nyc-dev
2016-03-31 20:14:04 +00:00
Roozbeh Pournader
9075152a8a
Merge "Invalidate TextView after locale change" into nyc-dev am: 1a08865
...
am: 2c915b9
* commit '2c915b99c6fe00ffbf2e33d4485bdb2a5fb89c14':
Invalidate TextView after locale change
Change-Id: Icf0c8a0b72973a24c54a67b96df6382d89bd1fb4
2016-03-31 19:46:15 +00:00