Commit Graph

63703 Commits

Author SHA1 Message Date
Carlos Valdivia
73fdc544a2 Merge "introduce GET_PASSWORD_PRIVILEDGED permission." into nyc-dev am: bb5e52f
am: 5a2dccb

* commit '5a2dccbc7067640de03c816676eaebb23d5e6ffd':
  introduce GET_PASSWORD_PRIVILEDGED permission.

Change-Id: Ie371d08e1307af6f3df9260d16be99435d065fa8
2016-04-01 20:13:33 +00:00
Carlos Valdivia
5a2dccbc70 Merge "introduce GET_PASSWORD_PRIVILEDGED permission." into nyc-dev
am: bb5e52f

* commit 'bb5e52f928c2215256ea46bc2592fa3c077c15b0':
  introduce GET_PASSWORD_PRIVILEDGED permission.

Change-Id: I6866ef20ad4bf4850601f53ea141168d091f8845
2016-04-01 20:08:58 +00:00
Carlos Valdivia
bb5e52f928 Merge "introduce GET_PASSWORD_PRIVILEDGED permission." into nyc-dev 2016-04-01 20:02:00 +00:00
Philip P. Moltmann
364f3823e5 Fix Print CTS tests. am: 0d1407e
am: 6e3fd4d

* commit '6e3fd4d45736c48e571fcceeb5a1a7827f21e274':
  Fix Print CTS tests.

Change-Id: I7669c750e3d91fd598b89a033f27c7009af90102
2016-04-01 19:45:48 +00:00
Philip P. Moltmann
6e3fd4d457 Fix Print CTS tests.
am: 0d1407e

* commit '0d1407e60998fc73cf93801de9c637e8d0e19b5b':
  Fix Print CTS tests.

Change-Id: I47d5044841603327562435b270d9efd1157d27ce
2016-04-01 19:41:05 +00:00
Philip P. Moltmann
0d1407e609 Fix Print CTS tests.
Fixes: 27971210
Change-Id: Ied11b2f1c528fe5e204e683d988b4efbd2562ef0
2016-04-01 12:22:13 -07:00
Adam Lesinski
bc3a1d4138 Merge "ResourcesManager: Fix a cache issue" into nyc-dev am: ce2a399
am: 75babad

* commit '75babad207ca90597be1f6aa1d3df1e82fcc5760':
  ResourcesManager: Fix a cache issue

Change-Id: I98d58cf904359b5323d205b9d96f20addc43e951
2016-04-01 19:09:12 +00:00
Adam Lesinski
75babad207 Merge "ResourcesManager: Fix a cache issue" into nyc-dev
am: ce2a399

* commit 'ce2a3990323433a3278100531ef6e9184497d058':
  ResourcesManager: Fix a cache issue

Change-Id: I6ec0fb190687fb7a421445938f71cc20aa0bf9af
2016-04-01 19:05:10 +00:00
Adam Lesinski
ce2a399032 Merge "ResourcesManager: Fix a cache issue" into nyc-dev 2016-04-01 18:53:22 +00:00
Adam Lesinski
0cd9a7ea3b ResourcesManager: Fix a cache issue
Forgot to cache the creating of ResourcesImpl during an Activity
override config update.

Bug:27644297
Change-Id: I65d9086f6d32f5adc7231aa3a1797d4f00c4b9a9
2016-04-01 11:48:10 -07:00
Alan Viverette
f229766bd5 Merge "Fix default gravity value for FrameLayout.LayoutParams" into nyc-dev am: 1722613
am: b7b3cb6

* commit 'b7b3cb6333094cd6c0fd1c886c9fbb5105528c0c':
  Fix default gravity value for FrameLayout.LayoutParams

Change-Id: Ia51755787274cf2e8adbd7068360ffe5233ef7cf
2016-04-01 18:42:04 +00:00
Alan Viverette
1acd5fe136 Merge "Refactor DatePickerDialog constructors to avoid early callback" into nyc-dev am: 228137f
am: 1174768

* commit '1174768d99492c8f90b7762eba49356ea5d7c9f2':
  Refactor DatePickerDialog constructors to avoid early callback

Change-Id: Ia05088a2995b1bd20de5999628968c1b20df04e0
2016-04-01 18:42:01 +00:00
Alan Viverette
b7b3cb6333 Merge "Fix default gravity value for FrameLayout.LayoutParams" into nyc-dev
am: 1722613

* commit '1722613b0cc058523d525d3ca63cfc0a7c54b8aa':
  Fix default gravity value for FrameLayout.LayoutParams

Change-Id: Ib151ce925ca0a07e7bd312fd67cba5b38a28219b
2016-04-01 18:34:45 +00:00
Alan Viverette
1174768d99 Merge "Refactor DatePickerDialog constructors to avoid early callback" into nyc-dev
am: 228137f

* commit '228137fa269b7e71205174f9d0d9ce91d9a1abfc':
  Refactor DatePickerDialog constructors to avoid early callback

Change-Id: If31e64a6f0a15d60e99c8b7960f906a153a91106
2016-04-01 18:34:39 +00:00
Alan Viverette
1722613b0c Merge "Fix default gravity value for FrameLayout.LayoutParams" into nyc-dev 2016-04-01 18:26:51 +00:00
Alan Viverette
228137fa26 Merge "Refactor DatePickerDialog constructors to avoid early callback" into nyc-dev 2016-04-01 18:22:20 +00:00
Jakub Pawlowski
760f294d94 Merge "Fix GATT Characteristic write type serialization" into nyc-dev am: 9d7d2ec
am: 216aa49

* commit '216aa498811b2fc08bc33dff2b8d0bc932e664d5':
  Fix GATT Characteristic write type serialization

Change-Id: Ib6b21831847d7c675024e5ff9b264da1fbc0aa1e
2016-04-01 18:10:19 +00:00
Ashutosh Joshi
7ef06b184d Added handling apps query response from context hub am: adf75e3
am: 3fb7070

* commit '3fb707059f9bf4b6a5fa1cbd8270aa7f330e1f79':
  Added handling apps query response from context hub

Change-Id: I21d4dbc7368723ba30456dee85f12f091b8b814b
2016-04-01 18:10:17 +00:00
Jakub Pawlowski
216aa49881 Merge "Fix GATT Characteristic write type serialization" into nyc-dev
am: 9d7d2ec

* commit '9d7d2ec6d04d6596cfebc276e49632cb0b390abb':
  Fix GATT Characteristic write type serialization

Change-Id: I34371be231333d4647e3f01d4f66f8c2e756b5e9
2016-04-01 18:05:36 +00:00
Ashutosh Joshi
3fb707059f Added handling apps query response from context hub
am: adf75e3

* commit 'adf75e31f52a7a935a66a884fb55631c7309ee75':
  Added handling apps query response from context hub

Change-Id: I7c41114194012e737aeda271e342ae8afd62543e
2016-04-01 18:05:34 +00:00
Andre Eisenbach
9d7d2ec6d0 Merge "Fix GATT Characteristic write type serialization" into nyc-dev 2016-04-01 17:59:31 +00:00
Jakub Pawlowski
db29556fe8 Fix GATT Characteristic write type serialization
Default writeType for GATT characteristic was not being
serialized into Parcel. This cause errors when trying to
write into Characteristic.

Bug: 27910548
Change-Id: Ib2f88cf991123eaea244f16fa36deb0d773c5a33
2016-04-01 17:59:09 +00:00
Ashutosh Joshi
adf75e31f5 Added handling apps query response from context hub
Added handling of app query reponse from context hub.
Exposed the maximum message size to clients.

Change-Id: I8d8ecaa2e75f6ef86ee65a3a050538cbbadc32eb
2016-04-01 17:57:35 +00:00
Carlos Valdivia
51b651aea1 introduce GET_PASSWORD_PRIVILEDGED permission.
That will be used to filter in passwords for Session based
AccountManager flows.

Bug: 27590532
Change-Id: I4a6d0540bcff186e416351a6f719600ce35d86a0
2016-04-01 10:55:34 -07:00
Alan Viverette
bd53c98985 Fix default gravity value for FrameLayout.LayoutParams
Sets default gravity value to the aptly-named DEFAULT_CHILD_GRAVITY.

Also cleans up FrameLayout lint warnings, annotations, and whitespace.

Bug: 27576632
Change-Id: I457b13791ff85f2228e61e85e44a502a28439e01
2016-04-01 13:50:28 -04:00
Alan Viverette
b83a9e2024 Merge "Clean up ArrayAdapter lint warnings and annotations" into nyc-dev am: a1009c2
am: e993618

* commit 'e99361882bbc1988cce63f3bfe914f7e3242b203':
  Clean up ArrayAdapter lint warnings and annotations

Change-Id: If04dd1db9270c710b27c5495c0d505c23dc9fb65
2016-04-01 17:38:28 +00:00
Alan Viverette
e99361882b Merge "Clean up ArrayAdapter lint warnings and annotations" into nyc-dev
am: a1009c2

* commit 'a1009c28cc904abd804d8ef47704549e5d9c93a0':
  Clean up ArrayAdapter lint warnings and annotations

Change-Id: I4d1bd2bd7b0ad26e1eace92073bcaebbf31f40c4
2016-04-01 17:33:38 +00:00
Alan Viverette
a1009c28cc Merge "Clean up ArrayAdapter lint warnings and annotations" into nyc-dev 2016-04-01 17:24:17 +00:00
Alan Viverette
a9a75f506e Refactor DatePickerDialog constructors to avoid early callback
Bug: 27475444
Change-Id: I2536f969ca734f3977163305c1d33ee0e2e222fc
2016-04-01 13:22:10 -04:00
Philip P. Moltmann
41e887730e Merge "Make sure PrinterCapabilitiesInfo always have sane values." into nyc-dev am: a0d2a83
am: 758ad44

* commit '758ad44079d33044cac56ab2a8f8bffecfd12f08':
  Make sure PrinterCapabilitiesInfo always have sane values.

Change-Id: Id570db875cfea722934aa1a454703e004b67783c
2016-04-01 17:03:00 +00:00
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
758ad44079 Merge "Make sure PrinterCapabilitiesInfo always have sane values." into nyc-dev
am: a0d2a83

* commit 'a0d2a83cf6f079a76dc0abb4039df25bf54ca61d':
  Make sure PrinterCapabilitiesInfo always have sane values.

Change-Id: I4f913ca29676968fd2cf9f232b6ba674037974cc
2016-04-01 16:58:38 +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
a0d2a83cf6 Merge "Make sure PrinterCapabilitiesInfo always have sane values." into nyc-dev 2016-04-01 16:49:42 +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