Paul Crowley
8692b7e5a1
Merge "Use mount service to create user dirs."
2015-06-03 12:54:00 +00:00
Erik Kline
2e54aed72b
am 4d511051: am 43a2c8ff: am b12c9704: Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev
...
* commit '4d51105164c0d15be361ea7bbe388cebfdc98c7c':
Send neighbors into NUD_PROBE rather than NUD_DELAY
2015-06-03 02:36:54 +00:00
Svetoslav
720e431603
am f766363a: am 1df1f713: am f559546d: Merge "Add annotations to a new API" into mnc-dev
...
* commit 'f766363a36ec6e6ef57288520fb99d9a9a680f47':
Add annotations to a new API
2015-06-03 02:36:43 +00:00
Andres Morales
ef10809f47
am 595bc35d: am a2a73650: am 8f589d01: Merge "[LockSettings] migrate patterns to be indexed at \'1\'" into mnc-dev
...
* commit '595bc35d70fe59f1a090686630f2b378190587ca':
[LockSettings] migrate patterns to be indexed at '1'
2015-06-03 02:36:38 +00:00
Jun Mukai
8acf610a70
am c891bfbb: am 7f0ad420: am 3c134877: Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev
...
* commit 'c891bfbb11522bbc60451eaa81dabf77f6180170':
Retire PFLAG_ONLY_DRAWS_BACKGROUND.
2015-06-03 02:36:32 +00:00
Roozbeh Pournader
151ce159fd
am 241ba868: am 085b657d: am c021632e: Merge "Load hyphenation data for more languages." into mnc-dev
...
* commit '241ba8684f6bb543bd4eb06a8b95312f784a6638':
Load hyphenation data for more languages.
2015-06-03 02:36:27 +00:00
Casper Bonde
e993885fe2
am 04b89280: am 0cc23891: am da177bb5: SAP: Change to use new SDP Api (4/4)
...
* commit '04b892809b90858718bf9f35b83a5793d7249add':
SAP: Change to use new SDP Api (4/4)
2015-06-03 02:36:15 +00:00
Alan Viverette
d03a54140d
am 14d8afc6: am 4156c870: am e25f6587: Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev
...
* commit '14d8afc62f8665def5daec10b6abdf8dc7d52d76':
API review feedback for ThemedSpinnerAdapter, Spinner
2015-06-03 02:36:04 +00:00
Erik Kline
4d51105164
am 43a2c8ff: am b12c9704: Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev
...
* commit '43a2c8ff4251039810c09fa5d52bfe40834f265b':
Send neighbors into NUD_PROBE rather than NUD_DELAY
2015-06-03 02:23:12 +00:00
Svetoslav
f766363a36
am 1df1f713: am f559546d: Merge "Add annotations to a new API" into mnc-dev
...
* commit '1df1f7137edb8ffa342a2cb4384e583290ee7b24':
Add annotations to a new API
2015-06-03 02:22:58 +00:00
Andres Morales
595bc35d70
am a2a73650: am 8f589d01: Merge "[LockSettings] migrate patterns to be indexed at \'1\'" into mnc-dev
...
* commit 'a2a736500cfe12de2c9efbcb5b14854ab7183b82':
[LockSettings] migrate patterns to be indexed at '1'
2015-06-03 02:22:53 +00:00
Jun Mukai
c891bfbb11
am 7f0ad420: am 3c134877: Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev
...
* commit '7f0ad420f435da9b57c2911d61803b52adeca528':
Retire PFLAG_ONLY_DRAWS_BACKGROUND.
2015-06-03 02:22:47 +00:00
Roozbeh Pournader
241ba8684f
am 085b657d: am c021632e: Merge "Load hyphenation data for more languages." into mnc-dev
...
* commit '085b657d856e87d884b5d80a7c0d83b735e48c1b':
Load hyphenation data for more languages.
2015-06-03 02:22:42 +00:00
Casper Bonde
04b892809b
am 0cc23891: am da177bb5: SAP: Change to use new SDP Api (4/4)
...
* commit '0cc2389180db98b93fa24767430d385766ae1378':
SAP: Change to use new SDP Api (4/4)
2015-06-03 02:22:25 +00:00
Alan Viverette
14d8afc62f
am 4156c870: am e25f6587: Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev
...
* commit '4156c8709bc46d48fb2a92ca580100308f68210d':
API review feedback for ThemedSpinnerAdapter, Spinner
2015-06-03 02:22:09 +00:00
Erik Kline
b12c97040b
Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev
2015-06-03 01:59:49 +00:00
Svetoslav
f559546d8c
Merge "Add annotations to a new API" into mnc-dev
2015-06-03 01:01:41 +00:00
Andres Morales
8f589d01d1
Merge "[LockSettings] migrate patterns to be indexed at '1'" into mnc-dev
2015-06-03 01:01:18 +00:00
Svetoslav
9ce9a15f62
Add annotations to a new API
...
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
2015-06-02 17:59:31 -07:00
Jun Mukai
3c1348773a
Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev
2015-06-03 00:59:15 +00:00
Roozbeh Pournader
c021632e07
Merge "Load hyphenation data for more languages." into mnc-dev
2015-06-03 00:56:24 +00:00
Casper Bonde
da177bb5a0
SAP: Change to use new SDP Api (4/4)
...
Added class to carry SAP SDP record data.
Change-Id: Ic0d07402eca52c88e2be101181f6dd12e5e738d0
Signed-off-by: Casper Bonde <c.bonde@samsung.com >
2015-06-03 00:04:37 +00:00
Alan Viverette
e25f6587d8
Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev
2015-06-02 23:51:07 +00:00
Jorim Jaggi
4bb01f1b11
am ecfeefb4: am f7f90276: am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev
...
* commit 'ecfeefb483a7a7ab33aae22ae85ccbdaa3a68522':
Fix API review: Camera prewarm
lock device orientation during app compatibility test
Fix reconfigure & setPremult alpha handling
Unflip TextureView getBitmap readback
Handle error states when refreshing accessibility node
2015-06-02 23:05:36 +00:00
Jorim Jaggi
1059e82161
am 8c981908: am 311f8a7c: am 11accf51: Merge "Make sure starting windows only draw once" into mnc-dev
...
* commit '8c981908983532484dc9c829a8b7f1535bae34d4':
Make sure starting windows only draw once
2015-06-02 23:05:31 +00:00
Jorim Jaggi
ecfeefb483
am f7f90276: am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev
...
* commit 'f7f90276a1f262c0db855edc49d544e157bc6e7f':
Fix API review: Camera prewarm
lock device orientation during app compatibility test
Fix reconfigure & setPremult alpha handling
Unflip TextureView getBitmap readback
Handle error states when refreshing accessibility node
2015-06-02 22:49:06 +00:00
Jorim Jaggi
8c98190898
am 311f8a7c: am 11accf51: Merge "Make sure starting windows only draw once" into mnc-dev
...
* commit '311f8a7cb0196d3a49a0f600856671193974b5ed':
Make sure starting windows only draw once
2015-06-02 22:49:00 +00:00
Nicolas Prevot
ca595cf8f3
am 8a4dbac5: am 83366d50: am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev
...
* commit '8a4dbac59894a7dab930b52f3f0d8c6826eef2c4':
Make ACTION_PROVISION_MANAGED_DEVICE public.
2015-06-02 22:46:59 +00:00
Svetoslav
0279868fa8
am c87f485d: am 7c773529: am 3aa3f5f8: Merge "Fix java doc" into mnc-dev
...
* commit 'c87f485da5e94d8b9fce5295c2b4ca528bc206db':
Fix java doc
2015-06-02 22:46:54 +00:00
Svetoslav
f81b973687
am 12e7abc6: am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev
...
* commit '12e7abc65971832285c873aa78d9b08d862f7d70':
Add API to hint whether to show on-board UI before a permission request.
2015-06-02 22:28:59 +00:00
Nicolas Prevot
8a4dbac598
am 83366d50: am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev
...
* commit '83366d500f48f73b8465c7e6cbe83c7a5aa91bbe':
Make ACTION_PROVISION_MANAGED_DEVICE public.
2015-06-02 22:28:46 +00:00
Svetoslav
c87f485da5
am 7c773529: am 3aa3f5f8: Merge "Fix java doc" into mnc-dev
...
* commit '7c773529afeff7d88386045c75b1eab994ae4ea9':
Fix java doc
2015-06-02 22:28:42 +00:00
Jorim Jaggi
7d01d2c6cf
Merge "Fix API review: Camera prewarm" into mnc-dev
2015-06-02 22:25:29 +00:00
Jorim Jaggi
11accf51c2
Merge "Make sure starting windows only draw once" into mnc-dev
2015-06-02 22:24:48 +00:00
Svetoslav
12e7abc659
am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev
...
* commit '703c7f9e776bb900f19c4dc30c03c6a22c833aba':
Add API to hint whether to show on-board UI before a permission request.
2015-06-02 22:15:46 +00:00
Nicolas Prevot
db6ac0e912
Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev
2015-06-02 22:11:11 +00:00
Svetoslav
3aa3f5f892
Merge "Fix java doc" into mnc-dev
2015-06-02 22:09:18 +00:00
Svetoslav
aa048b6242
Fix java doc
...
Change-Id: I927a1766e1e4cac99d0d7999fef568b82af769af
2015-06-02 15:08:48 -07:00
Alan Viverette
2add9bcf8c
API review feedback for ThemedSpinnerAdapter, Spinner
...
Moves themed interface out of Spinner and extends SpinnerAdapter, updates
Spinner constructor to take a Theme rather than a Context.
Does NOT change BaseAdapter to implement ThemedSpinnerAdapter, because
the BaseAdapter class does not have any notion of layout inflation and
that would break the contract implied by ThemedSpinnerAdapter.
Bug: 21571899
Change-Id: Id7e8d630458857ce6c93a6a8b8f920e169ee1152
2015-06-02 14:54:40 -07:00
Svetoslav
c5ff0020a2
Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev
2015-06-02 21:53:20 +00:00
Svetoslav
20770ddbd4
Add API to hint whether to show on-board UI before a permission request.
...
bug:21511988
Change-Id: I9d1d7adf34b68074e65510f53b6e642cf784cf6b
2015-06-02 14:48:38 -07:00
Brian Attwell
df336c9064
am 6b37b0df: am 03c818b5: am b36ad5dc: Decouple ProviderStatus & internal provider state
...
* commit '6b37b0df1102f0f7f3336638a68defba197d1910':
Decouple ProviderStatus & internal provider state
2015-06-02 21:27:59 +00:00
Amith Yamasani
982c0d9d4d
am 9984f181: am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev
...
* commit '9984f181c5d0ed933837e548a97729ae81b5e4dd':
Temporarily whitelist an app for network during doze
2015-06-02 21:27:36 +00:00
Jun Mukai
3427f57e03
Retire PFLAG_ONLY_DRAWS_BACKGROUND.
...
Per discussion on another CL, this CL retires
PFLAG_ONLY_DRAWS_BACKGROUND because this is over-optimizing and
misleading. Also setFlags() needs to care both the background
and the foreground.
Bug: 20734520
Change-Id: I57d63e776b5fbad9effd10ad87e683bbb2a6dacd
2015-06-02 14:27:35 -07:00
Robin Lee
afbf476283
am 9aa90541: am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev
...
* commit '9aa905416931860cd92364aa2453c6a859785b2e':
Device policy: consistent javadoc and annotations
2015-06-02 21:27:19 +00:00
Wale Ogunwale
f306ae7260
am be86841c: am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev
...
* commit 'be86841c64ea0d1b67bd77c0a5687729bc521b27':
@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
2015-06-02 21:26:41 +00:00
Robin Lee
61ffa153ec
am 24613fae: am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev
...
* commit '24613fae6b82456837ab8e5d495fdf88a336ce52':
Revert "Consistent documentation and annotations for DPMS"
2015-06-02 21:26:30 +00:00
Robin Lee
45b5675d4c
am b9555129: am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev
...
* commit 'b95551290a61c1a1b2cbc494055cdcd0f681e060':
Consistent documentation and annotations for DPMS
2015-06-02 21:26:24 +00:00
Brian Attwell
6b37b0df11
am 03c818b5: am b36ad5dc: Decouple ProviderStatus & internal provider state
...
* commit '03c818b575c9f4481fee3ceaf21ac07540a69619':
Decouple ProviderStatus & internal provider state
2015-06-02 21:16:41 +00:00
Amith Yamasani
9984f181c5
am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev
...
* commit '52f26b6399cd28bfaa5822cb4c3a5340404f7800':
Temporarily whitelist an app for network during doze
2015-06-02 21:10:40 +00:00