Joe LaPenna
cc5bb55a6a
Merge "Fix NPE in AlarmManager.cancel(...)" into nyc-dev am: f38aa6b
...
am: 6a935d1
* commit '6a935d1aa829bd225bb1f40f8c60ee7dcd89b51e':
Fix NPE in AlarmManager.cancel(...)
Change-Id: I2df6b1a266da854752b4f06aff1850eb6adcc010
2016-04-01 22:39:49 +00:00
Jorim Jaggi
754598ad52
Launch everything from the shade in full-screen stack am: e6e108e
...
am: da04593
* commit 'da0459306253b98cd0f8f6f3ebd2e9c5aef15a40':
Launch everything from the shade in full-screen stack
Change-Id: I196455fc49388a5173f484f755941a934fba1ff7
2016-04-01 22:39:37 +00:00
Joe LaPenna
6a935d1aa8
Merge "Fix NPE in AlarmManager.cancel(...)" into nyc-dev
...
am: f38aa6b
* commit 'f38aa6ba2b85e24d8bc08b96a456a01d03d22f5f':
Fix NPE in AlarmManager.cancel(...)
Change-Id: I6cb099702b9a0681e8f5c939487f3587af73e656
2016-04-01 22:29:34 +00:00
Jorim Jaggi
da04593062
Launch everything from the shade in full-screen stack
...
am: e6e108e
* commit 'e6e108e0eb5d552e3b35bf1803838f7a00730abd':
Launch everything from the shade in full-screen stack
Change-Id: Ied4de85cece92893d8fa90b4cc69a31971115eb7
2016-04-01 22:29:22 +00:00
Joe LaPenna
f38aa6ba2b
Merge "Fix NPE in AlarmManager.cancel(...)" into nyc-dev
2016-04-01 22:22:46 +00:00
Jorim Jaggi
e6e108e0eb
Launch everything from the shade in full-screen stack
...
Bug: 27864383
Change-Id: I2925661f1c325f4385876188a5866ab6b57a8f19
2016-04-01 22:17:58 +00:00
Chong Zhang
abe585a6ae
Merge "Avoid extra relaunch when rotating side-by-side apps" into nyc-dev am: fbe10f1
...
am: 47814b0
* commit '47814b082929c3d4ac9eda2f9cd7678ae4f0f0fb':
Avoid extra relaunch when rotating side-by-side apps
Change-Id: I9d2da65ae7f9bd411572db4c96dae8a3b51440e6
2016-04-01 22:12:57 +00:00
Chong Zhang
47814b0829
Merge "Avoid extra relaunch when rotating side-by-side apps" into nyc-dev
...
am: fbe10f1
* commit 'fbe10f175fa3cb2083d15b4dbfb05c6f223d7f2c':
Avoid extra relaunch when rotating side-by-side apps
Change-Id: I1f58f668a9593571b26d9c8c9692cd625e9679a8
2016-04-01 22:07:39 +00:00
Chong Zhang
fbe10f175f
Merge "Avoid extra relaunch when rotating side-by-side apps" into nyc-dev
2016-04-01 21:56:45 +00:00
Ashutosh Joshi
65d610b3fd
Revert "Added handling apps query response from context hub"
...
This reverts commit adf75e31f5 .
Change-Id: I8391eb57c3a53e686bd817d27860fa6f785113f1
(cherry picked from commit 2c697fb4a8 )
2016-04-01 21:17:14 +00:00
Ashutosh Joshi
c662c0fa5e
Revert "Added handling apps query response from context hub"
...
am: 2c697fb
* commit '2c697fb4a8b8f8c0a2acf1fb15027f363f74c2dc':
Revert "Added handling apps query response from context hub"
Change-Id: I65cc836a3ecf42598f7e00772ed40dd08322cf8b
2016-04-01 21:15:45 +00:00
Joe LaPenna
33ee4bf18b
Fix NPE in AlarmManager.cancel(...)
...
If AlarmManager.cancel is called before any component has had a chance
to register an alarm, sWrappers will not have been set, as it is only
initialized in setImpl.
When cancelling an alarm and sWrappers does not exist, log a warning and
return early.
BUG: 27972657
Change-Id: Ied10719ba1d154f97eecfc32f429fd9ce39bf747
2016-04-01 14:07:35 -07:00
Chong Zhang
167bbfac24
Avoid extra relaunch when rotating side-by-side apps
...
Update configuration with WM first and check if the stacks need to be
resized due to the update. If so, let activity manager resize the stacks
inline, instead of letting WM schedule another pass of resizeStack. This
way the configuration will be updated to the latest before ensureActivity-
ConfigurationLocked, and we don't need another relaunch there.
bug: 27834014
Change-Id: Ib761a96cada0c3247b0480f18370670c593159da
2016-04-01 13:58:41 -07:00
Ashutosh Joshi
2c697fb4a8
Revert "Added handling apps query response from context hub"
...
This reverts commit adf75e31f5 .
Change-Id: I8391eb57c3a53e686bd817d27860fa6f785113f1
2016-04-01 20:49:28 +00:00
Alan Viverette
5fe5ee2a0d
Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev am: f045808
...
am: b02fc79
* commit 'b02fc79930fb6f0e5da66b7b93efad58bb1b43cd':
Clean up Dialog annotations, lint warnings, and declarations
Change-Id: I2943f62dbe414818b26f2191c54dfabafcd4da44
2016-04-01 20:31:57 +00:00
Alan Viverette
b02fc79930
Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev
...
am: f045808
* commit 'f04580852d387fae556de0250cb18d32169c2cdb':
Clean up Dialog annotations, lint warnings, and declarations
Change-Id: Ic6de44b10c04ccd5f94e60c6be47166cf64f317e
2016-04-01 20:27:19 +00:00
Alan Viverette
f04580852d
Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev
2016-04-01 20:17:16 +00:00
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
Alan Viverette
48728c2179
Clean up Dialog annotations, lint warnings, and declarations
...
No functional changes.
Change-Id: If38c9d829d83e762f8c2d05c2fe060c56804b38f
2016-04-01 15:00:10 -04: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