OSDN Git Service
Chris Craik [Sat, 6 Feb 2016 02:17:35 +0000 (18:17 -0800)]
Fix build
Change-Id: I1ad30ae50cbdff9267d0121a446e6adbe3ad17ee
Jan Nordqvist [Sat, 6 Feb 2016 01:40:13 +0000 (01:40 +0000)]
Merge "Hotspot 2.0 release 2 client app."
Chris Craik [Sat, 6 Feb 2016 01:39:34 +0000 (01:39 +0000)]
Merge "Move several property queries to Properties class"
Chris Craik [Fri, 5 Feb 2016 23:59:29 +0000 (15:59 -0800)]
Move several property queries to Properties class
bug:
17478770
This removes a lot of redundant property query code, and puts the
queries all in one place, so defining them automatically will be simpler
in the future.
Change-Id: I0428550e6081f07bc6554ffdf73b22284325abb8
Jan Nordqvist [Fri, 5 Feb 2016 23:30:26 +0000 (15:30 -0800)]
Hotspot 2.0 release 2 client app.
Change-Id: Ic8f93a3c9fede3f25c03b0153826ac5c49771b60
Adam Lesinski [Sat, 6 Feb 2016 00:52:38 +0000 (00:52 +0000)]
Merge "Track BLE scans in BatteryStats"
Jeff Sharkey [Sat, 6 Feb 2016 00:15:41 +0000 (00:15 +0000)]
Merge "Use the right ClassLoader when restoring."
Jeff Sharkey [Sat, 6 Feb 2016 00:13:16 +0000 (17:13 -0700)]
Use the right ClassLoader when restoring.
If we're restoring after a background process death, the Parcelable
creator cache is cold, and since we're handing in a null ClassLoader
the best the platform can do is try the default ClassLoader which
knows nothing about the running app.
That's why ClassLoaderCreator exists, so use it to snag the relevant
ClassLoader and pass it along.
Bug:
26075620
Change-Id: I6fd977d6178dd0f5f9c465597f5806a08097ac7c
John Reck [Fri, 5 Feb 2016 23:59:55 +0000 (15:59 -0800)]
resolve merge conflicts of
9ea5295597 to master.
Change-Id: I68b883e8a1bb17abd4cf151d057dd07e53a80f50
John Reck [Fri, 5 Feb 2016 23:52:12 +0000 (23:52 +0000)]
Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"
am:
857b65657d
* commit '
857b65657d453801e9b73f998043603456dac813':
libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case
John Reck [Fri, 5 Feb 2016 23:38:10 +0000 (23:38 +0000)]
Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"
Chong Zhang [Fri, 5 Feb 2016 23:32:56 +0000 (23:32 +0000)]
Merge "Check wallpaper visibility to determine if wallpaper is obscuring apps."
Jeff Sharkey [Fri, 5 Feb 2016 23:21:29 +0000 (23:21 +0000)]
Merge "Tweaks to file:// Uri StrictMode checks."
Jeff Sharkey [Fri, 5 Feb 2016 23:19:10 +0000 (16:19 -0700)]
Tweaks to file:// Uri StrictMode checks.
Whitelist two more legacy intent actions, and don't enforce the
StrictMode checks when resolving intents that might be coming from
legacy apps. Newer apps would have already been yelled at directly
before getting to the resolver.
Bug:
26976516,
26977622
Change-Id: Ibf72a361ed68c52cfaac16c32ab40e79005a42e7
Abhijith Shastry [Fri, 5 Feb 2016 23:08:28 +0000 (23:08 +0000)]
Merge "Carrier config to support overriding block suppress duration after emergency contact."
Abhijith Shastry [Fri, 5 Feb 2016 01:28:03 +0000 (17:28 -0800)]
Carrier config to support overriding block suppress duration after emergency contact.
BUG:
26989170
Change-Id: I6d8f13dd4f2b69730826cc8440a22c7154255ac8
Chong Zhang [Fri, 5 Feb 2016 22:42:36 +0000 (14:42 -0800)]
Check wallpaper visibility to determine if wallpaper is obscuring apps.
bug:
26948569
Change-Id: I710893ee086dce441cb5e2744fc721d3e1a2fd8a
Alex Klyubin [Fri, 5 Feb 2016 22:37:31 +0000 (22:37 +0000)]
Merge "Fix typo in KeyInfo Javadoc." am:
e8fbc20e12
am:
b21416e287
* commit '
b21416e2875973706d8b922428225194d9625875':
Fix typo in KeyInfo Javadoc.
Alex Klyubin [Fri, 5 Feb 2016 22:33:09 +0000 (22:33 +0000)]
Merge "Fix typo in KeyInfo Javadoc."
am:
e8fbc20e12
* commit '
e8fbc20e12da685acddffc01c41ccf134f051ce9':
Fix typo in KeyInfo Javadoc.
Jean-Michel Trivi [Fri, 5 Feb 2016 22:27:25 +0000 (22:27 +0000)]
Merge "Dynamic audio policies: fix AttributeMatchCriterion addition in mix"
Alex Klyubin [Fri, 5 Feb 2016 22:26:56 +0000 (22:26 +0000)]
Merge "Fix typo in KeyInfo Javadoc."
Steven Dao [Fri, 5 Feb 2016 22:23:53 +0000 (22:23 +0000)]
Merge "Fix GridView isHeading computation"
Tyler Gunn [Fri, 5 Feb 2016 22:18:26 +0000 (22:18 +0000)]
Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
am:
6c4aac0bde
* commit '
6c4aac0bdee2678818f577490c4acfdeeba81c59':
IMS: Constants For Audio Quality, Supp. Services
Alex Klyubin [Fri, 5 Feb 2016 22:18:19 +0000 (14:18 -0800)]
Fix typo in KeyInfo Javadoc.
Change-Id: I801005a93aee71b93b3d6cf3f7c38361493ff203
Tyler Gunn [Fri, 5 Feb 2016 22:13:32 +0000 (22:13 +0000)]
Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
Steven Dao [Fri, 5 Feb 2016 21:51:55 +0000 (13:51 -0800)]
Fix GridView isHeading computation
- Same issue that was previously in the ListView
Change-Id: I3a3105b46bdadc43ea679b4d29d0719a67c291bc
Christian Poetzsch [Fri, 5 Feb 2016 14:22:01 +0000 (14:22 +0000)]
hwui: set buffer destroyed swap mode explicitly
Not using EGL_SWAP_BEHAVIOR_PRESERVED_BIT as config attribute for
eglChooseConfig doesn't automatically mean the swap behavior is buffer
destroyed. This is driver implementation specific and on some hw this
can still be buffer preserved. Make sure it is buffer destroyed by
explicitly setting it for every new surface when requested.
Change-Id: Ie2c7c89b0d20e35832b488c6263bb4d9dd844a75
Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
John Reck [Fri, 5 Feb 2016 21:40:14 +0000 (21:40 +0000)]
Merge "Add a debug assert to track down infinite loop"
Doris Liu [Fri, 5 Feb 2016 21:31:23 +0000 (21:31 +0000)]
Merge "Ref count the nodes in VectorDrawable"
Doris Liu [Fri, 5 Feb 2016 21:31:05 +0000 (21:31 +0000)]
Merge "Revert "Revert "VectorDrawable native rendering - Step 4 of MANY"""
Makoto Onuki [Fri, 5 Feb 2016 21:30:38 +0000 (21:30 +0000)]
Merge "Prevent NPE in ContactsContract"
Makoto Onuki [Fri, 5 Feb 2016 21:23:21 +0000 (13:23 -0800)]
Prevent NPE in ContactsContract
Bug
26730982
Change-Id: I36fdfffba79e0696175edd42bb131f92cba47499
Peng Xu [Fri, 5 Feb 2016 21:07:22 +0000 (21:07 +0000)]
Merge "Fix potential crash when getSensorList returns error"
Jason Monk [Fri, 5 Feb 2016 21:07:14 +0000 (21:07 +0000)]
Merge "Fix some battery icon issues"
Peng Xu [Fri, 5 Feb 2016 06:27:20 +0000 (22:27 -0800)]
Fix potential crash when getSensorList returns error
bug: b/
19937981
Change-Id: Ibfb8c625609923b4e60fa73685dbeb10944ab2b9
John Reck [Fri, 5 Feb 2016 21:03:47 +0000 (13:03 -0800)]
Add a debug assert to track down infinite loop
Bug:
26980851
Change-Id: I326983ab367782048311b6cf06d800f72837e38e
Jeff Sharkey [Fri, 5 Feb 2016 21:01:19 +0000 (21:01 +0000)]
Merge "Prepare user storage just before using it."
Jason Monk [Fri, 5 Feb 2016 20:54:10 +0000 (15:54 -0500)]
Fix some battery icon issues
Bug:
26818515
Change-Id: I93f3fb19f82ba8c169b2d0c8d43f1c28b2e71ae9
Jason Monk [Fri, 5 Feb 2016 20:03:07 +0000 (20:03 +0000)]
Merge "Update QS defaults list"
Jason Monk [Fri, 5 Feb 2016 20:01:36 +0000 (20:01 +0000)]
Merge "Have nav bar handle density changes"
Jason Monk [Fri, 5 Feb 2016 19:59:42 +0000 (19:59 +0000)]
Merge "Fix external status bar icon sizes"
Chris Wren [Fri, 5 Feb 2016 19:57:39 +0000 (19:57 +0000)]
Merge "move assistant to system API"
Chris Wren [Fri, 5 Feb 2016 19:55:35 +0000 (14:55 -0500)]
move assistant to system API
Bug:
26693581
Change-Id: I7e29b8521e2c33683b8032e63da734cfde1dfcc9
Jason Monk [Fri, 5 Feb 2016 19:55:05 +0000 (14:55 -0500)]
Update QS defaults list
Also allow custom tiles to be in the default list.
Bug:
26425051
Change-Id: I88af8b251dda333f1392e9959c8505e85f4cbafa
Makoto Onuki [Fri, 5 Feb 2016 19:51:16 +0000 (19:51 +0000)]
Merge "Remove com.google.android.syncadapters.contacts from exception list"
Makoto Onuki [Fri, 5 Feb 2016 19:43:47 +0000 (11:43 -0800)]
Remove com.google.android.syncadapters.contacts from exception list
Bug
26902400
Bug
26481405
Change-Id: I3b4d0217ee033f727074f68ebe6a1c1461509d04
Amith Yamasani [Fri, 5 Feb 2016 19:41:03 +0000 (19:41 +0000)]
Merge "Rewrite app standby stats"
Amith Yamasani [Thu, 4 Feb 2016 02:02:06 +0000 (18:02 -0800)]
Rewrite app standby stats
Don't mix up with usage stats. Keep a separate db and history
based on elapsed time and screen on time.
Unit tests for AppIdleHistory class.
Bug:
26989006
Change-Id: If343785b46da1db67f7c1c1263854c2732a232c6
Abhijith Shastry [Fri, 5 Feb 2016 19:36:06 +0000 (19:36 +0000)]
Merge "Update javadoc for BlockedNumberContract."
Jason Monk [Fri, 5 Feb 2016 19:18:21 +0000 (14:18 -0500)]
Fix external status bar icon sizes
Bug:
26850030
Change-Id: I6de129aa1b6c73b0c1ad5373e59c2ad398b2dc7a
Selim Cinek [Fri, 5 Feb 2016 19:22:00 +0000 (19:22 +0000)]
Merge "Adapted the notification header colors to spec"
Jean-Michel Trivi [Sat, 30 Jan 2016 00:33:55 +0000 (16:33 -0800)]
Dynamic audio policies: fix AttributeMatchCriterion addition in mix
When adding an AttributeMatchCriterion for a mix, build the instance
with the constructor that matches the rule.
Bug
26798796
Change-Id: I130f4bdab51644685413d294096d35d9685ea5eb
Doris Liu [Fri, 5 Feb 2016 00:16:27 +0000 (16:16 -0800)]
Ref count the nodes in VectorDrawable
Also added API check so that for pre-N we ignore invalid VD animation,
in order to avoid breaking old apps.
Bug:
26975469
Bug:
26949340
Change-Id: I498539ad6a05de3d886e7dcdc8a167e78333ab11
Wale Ogunwale [Fri, 5 Feb 2016 19:04:55 +0000 (19:04 +0000)]
Merge "Exclude tasks manipulated before user setup is complete from Recents"
Jeremy Klein [Fri, 5 Feb 2016 18:50:57 +0000 (18:50 +0000)]
Merge "Fix a small issue with the BT Tether callback value."
Selim Cinek [Fri, 5 Feb 2016 18:31:20 +0000 (10:31 -0800)]
Adapted the notification header colors to spec
Change-Id: Ifa9483a5e71f32be2df14912982076d7bf2a6e9a
Jeremy Klein [Fri, 5 Feb 2016 18:37:32 +0000 (10:37 -0800)]
Fix a small issue with the BT Tether callback value.
It was incorrect when disabling bt tethering. Note that this had
no practical effect because there's no callback for disabling, but
the change is good for readability's sake.
Change-Id: Id80de58b24e94ec5a8ee38d94fb3016ae7835e43
Roozbeh Pournader [Fri, 5 Feb 2016 18:35:13 +0000 (18:35 +0000)]
Merge "Restore DroidSansFallback to fonts.xml"
Etan Cohen [Fri, 5 Feb 2016 18:31:21 +0000 (18:31 +0000)]
Merge "NAN: for failed configurations - added configuration which failed." into mm-wireless-dev
am:
02033f800b
* commit '
02033f800bda142994e402f3f66aaecb1c9f41be':
NAN: for failed configurations - added configuration which failed.
Jason Monk [Fri, 5 Feb 2016 18:31:03 +0000 (13:31 -0500)]
Have nav bar handle density changes
Bug:
26038240
Change-Id: I05a9a9ca52b0c9ccba37835d38cca69465b3745e
Etan Cohen [Fri, 5 Feb 2016 18:27:08 +0000 (18:27 +0000)]
Merge "NAN: for failed configurations - added configuration which failed." into mm-wireless-dev
Jeremy Klein [Fri, 5 Feb 2016 18:15:29 +0000 (18:15 +0000)]
Merge "Remove several TetherUtil functions which are no longer needed."
Filip Gruszczynski [Fri, 5 Feb 2016 18:09:05 +0000 (18:09 +0000)]
Merge "Only make home opaque when requesting visible behind false."
Igor Murashkin [Fri, 5 Feb 2016 18:04:35 +0000 (18:04 +0000)]
Merge "api: Un-hide new reflection 1.8 APIs" am:
700ed048f9
am:
8ac2db4364
* commit '
8ac2db4364e5c43ea6c3a90538b9b80933964750':
api: Un-hide new reflection 1.8 APIs
Igor Murashkin [Fri, 5 Feb 2016 18:02:05 +0000 (18:02 +0000)]
Merge "api: Un-hide new reflection 1.8 APIs"
am:
700ed048f9
* commit '
700ed048f9c860fb18439ef79a8b7b107e7fe054':
api: Un-hide new reflection 1.8 APIs
Jeff Sharkey [Tue, 2 Feb 2016 00:03:54 +0000 (17:03 -0700)]
Prepare user storage just before using it.
Wire up preparing of user-specific app storage to existing user
lifecycle hooks. This way we're sure the storage is ready to roll
just before we start reconciling app data directories.
This also has the nice property that we only prepare storage when
we know that keys are unlocked.
Bug:
25796509
Change-Id: Ic7df9ddbcfb1e20649d11b6cf68d424e3c365ee1
Abhijith Shastry [Fri, 5 Feb 2016 00:33:32 +0000 (16:33 -0800)]
Update javadoc for BlockedNumberContract.
BUG:
26232372
Change-Id: I57330782fa439bed52c595986916eb24bfbceab0
Igor Murashkin [Fri, 5 Feb 2016 17:53:04 +0000 (17:53 +0000)]
Merge "api: Un-hide new reflection 1.8 APIs"
Igor Murashkin [Fri, 5 Feb 2016 05:04:29 +0000 (21:04 -0800)]
api: Un-hide new reflection 1.8 APIs
(cherry-picked from commit
2b11b688b841a00afe5eda8bda02409172751318)
Change-Id: Ica3dba651f4a9239c39c4c90fb8478a5f6ff8b71
Steve McKay [Fri, 5 Feb 2016 17:27:19 +0000 (17:27 +0000)]
Merge "Move create folder and sort to overflow menu, cleanup back behavior."
Martijn Coenen [Fri, 5 Feb 2016 17:26:37 +0000 (17:26 +0000)]
Merge "Improve NFC-F transceive() docs." am:
1f4f7190a8
am:
21ab24f5c7
* commit '
21ab24f5c7a1659981fab2764e406f51e9d3eada':
Improve NFC-F transceive() docs.
Julia Reynolds [Fri, 5 Feb 2016 17:10:23 +0000 (17:10 +0000)]
Merge "NoMan support for FBE."
Glenn Kasten [Fri, 5 Feb 2016 17:02:53 +0000 (17:02 +0000)]
Merge "Update documentation to say write not read or play"
Fergus Henderson [Fri, 5 Feb 2016 16:51:58 +0000 (16:51 +0000)]
Merge "Decrease the key progress increment step size to allow finer control of seekbar using keys. Bug:
26926346 Change-Id: Ic7d290552c102d8602275f19dac4d57de4a53297"
Steve McKay [Fri, 5 Feb 2016 03:40:45 +0000 (19:40 -0800)]
Move create folder and sort to overflow menu, cleanup back behavior.
Improved drawer management in reponse to back button presses:
- if drawer is open (and we didn't just open it), close it.
- if at top of root (and we didn't close root) open it.
- there's a timeout on this behavior such that pressing back
a second time within a 1.5 second perior will NOT initiate
the behaviors described above.
Change-Id: I5990848cd3047d9dc985ec10e57ab3a0f99ce79c
Ben Kwa [Fri, 5 Feb 2016 16:19:13 +0000 (16:19 +0000)]
Merge "Update apostophes to material spec."
Alan Viverette [Fri, 5 Feb 2016 16:03:58 +0000 (16:03 +0000)]
Merge "Multi-user support for display density changes"
Ben Kwa [Fri, 5 Feb 2016 16:02:21 +0000 (08:02 -0800)]
Update apostophes to material spec.
TLDR: use \u2019 instead of ' for apostrophes.
See
https://spec.googleplex.com/quantum/style/writing.html#writing-capitalization-punctuation.
Change-Id: Idc3bee55dc65a1ebd5bf12483fced85d36c1614f
Julia Reynolds [Wed, 3 Feb 2016 20:04:05 +0000 (15:04 -0500)]
NoMan support for FBE.
Rebind to service components that should now available.
Bug:
26941542
Bug:
26940790
Change-Id: Id5290a75894f61cf55b3a2b82d08b1533bf099ca
Chris Wren [Fri, 5 Feb 2016 15:50:38 +0000 (15:50 +0000)]
Merge "Revert "move assistant to system API""
Chris Wren [Fri, 5 Feb 2016 15:49:22 +0000 (10:49 -0500)]
Revert "move assistant to system API"
This reverts commit
c441856bb6c5712efab9d5ef422c95210884a1d8.
Alan Viverette [Fri, 5 Feb 2016 15:30:28 +0000 (15:30 +0000)]
Merge "Ensure Bitmap.getDefaultDensity() matches DENSITY_DEVICE"
Matt Sarett [Fri, 5 Feb 2016 13:30:11 +0000 (08:30 -0500)]
Copy appropriate number of rows in RecyclingClippingPixelAllocator
This is used by BitmapRegionDecoder to decode into a recycled
bitmap.
Since the specification does not guarantee that the recycled
bitmap will be larger than the decoded region, we must be careful
to only to copy min(recycledHeight, decodeHeight) rows.
This should fix flakiness in the BitmapRegionDecoderTest on cts.
BUG:
26978886
Change-Id: I318468b0eaa67bd9a7860824f75d45df9bf5fbce
Ben Kwa [Fri, 5 Feb 2016 14:44:15 +0000 (06:44 -0800)]
Fix an NPE in RestoreStackTask.
BUG=
27007822
Change-Id: I166dc89bfe94f2a07a1fe3769cbce763b7472ec0
Chris Wren [Fri, 5 Feb 2016 13:58:54 +0000 (13:58 +0000)]
Merge "move assistant to system API"
Esteban Talavera [Fri, 5 Feb 2016 13:31:10 +0000 (13:31 +0000)]
Merge "Fix unit tests"
Chris Wren [Thu, 28 Jan 2016 20:38:41 +0000 (15:38 -0500)]
move assistant to system API
Bug:
22455414
Change-Id: I2fbb37fceef3058bc70d540a58fdcd8af5e7a76d
Calin Juravle [Fri, 5 Feb 2016 11:55:43 +0000 (11:55 +0000)]
Merge "Fix useProfiles usage in PackageDexOptimizer"
shwetachahar [Thu, 4 Feb 2016 19:42:14 +0000 (19:42 +0000)]
Decrease the key progress increment step size to allow finer control of
seekbar using keys.
Bug:
26926346
Change-Id: Ic7d290552c102d8602275f19dac4d57de4a53297
Shreyas Basarge [Fri, 5 Feb 2016 11:51:33 +0000 (11:51 +0000)]
Merge "Add more logging to JobScheduler"
Andrei Stingaceanu [Wed, 3 Feb 2016 17:52:00 +0000 (17:52 +0000)]
Keyboard Shortcuts - cleanup
Clean up the code, introduce and use a separator, fix the
existing end-of-groups separator.
Bug:
26848253
Change-Id: I2b7723ebf257e7176f08551766c59d86d01cf6a6
Martijn Coenen [Fri, 5 Feb 2016 09:44:28 +0000 (09:44 +0000)]
Merge "Improve NFC-F transceive() docs."
am:
1f4f7190a8
* commit '
1f4f7190a8fe6bd87fd9dd198cb711cb1a540354':
Improve NFC-F transceive() docs.
Martijn Coenen [Fri, 5 Feb 2016 09:38:16 +0000 (09:38 +0000)]
Merge "Improve NFC-F transceive() docs."
Martijn Coenen [Fri, 5 Feb 2016 09:24:49 +0000 (10:24 +0100)]
Improve NFC-F transceive() docs.
It wrongly said the SoD included the length;
put a sample frame in the docs to help devs.
Change-Id: I8ea74f37e7335f3e05f7df81fc303bf6195ac3cc
Daichi Hirono [Fri, 5 Feb 2016 09:14:37 +0000 (09:14 +0000)]
Merge "Fix NullPointerException around getObjectInfo."
Daichi Hirono [Fri, 5 Feb 2016 08:21:13 +0000 (17:21 +0900)]
Fetch mime type from file name when format code does not help.
MTP spec defines format code as a file type of object, but we don't have
format code for some file types like PDF. This CL adds fallback that
tries to obtain mime type from file name in such case.
BUG=
27004957
Change-Id: Id61352bf4726f4e044e57edadcefbf179fe3f882
Daichi Hirono [Fri, 5 Feb 2016 07:04:19 +0000 (16:04 +0900)]
Fix NullPointerException around getObjectInfo.
BUG=
27000341
Change-Id: I8888b627c62e9baaf91c19194dc89d95c65b8225
Daniel Chapin [Fri, 5 Feb 2016 05:18:36 +0000 (05:18 +0000)]
Revert "TaskManager bench"
This reverts commit
02db03ca0584371504fd29ced77c00d601cb0971.
Change-Id: I86bdf5e6774e99f9add59a657bfc50d45ebfda1d
Jaewan Kim [Fri, 5 Feb 2016 04:26:28 +0000 (04:26 +0000)]
Merge "Support KEYCODE_APP_SWITCH key for TV"
Steve McKay [Fri, 5 Feb 2016 04:16:37 +0000 (04:16 +0000)]
Merge "Simplify State initialization w/ better semantics + improved Task security."