OSDN Git Service

android-x86/frameworks-base.git
9 years agoam a2abf79f: am 5fa7b8bd: am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performa...
Joe Fernandez [Tue, 26 May 2015 20:46:23 +0000 (20:46 +0000)]
am a2abf79f: am 5fa7b8bd: am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

* commit 'a2abf79f6ea462ef154af9150e81595614840d61':
  docs: M Preview - Performance Testing

9 years agoam 5fa7b8bd: am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing...
Joe Fernandez [Tue, 26 May 2015 20:30:26 +0000 (20:30 +0000)]
am 5fa7b8bd: am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

* commit '5fa7b8bd8cbf6407ab88bdf5f3e3a6e40053b98c':
  docs: M Preview - Performance Testing

9 years agoam ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc...
Joe Fernandez [Tue, 26 May 2015 20:22:00 +0000 (20:22 +0000)]
am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

* commit 'ec5aa0e183011d0243219f760250b917d7a24c63':
  docs: M Preview - Performance Testing

9 years agoam cbff23cb: am 96e97b55: am 37f827db: am c3d171bb: Merge "docs: M Preview Testing...
Joe Fernandez [Tue, 26 May 2015 20:15:54 +0000 (20:15 +0000)]
am cbff23cb: am 96e97b55: am 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs

* commit 'cbff23cb04115aaafb0362797255d2f6b7133071':
  docs: M Preview Testing Guide

9 years agoam 1897f104: am a04c7d40: Merge "media: Update MediaCodec class description" into...
Lajos Molnar [Tue, 26 May 2015 20:15:49 +0000 (20:15 +0000)]
am 1897f104: am a04c7d40: Merge "media: Update MediaCodec class description" into mnc-dev

* commit '1897f104f18bfb2736e9960381ad5f1f704bcf95':
  media: Update MediaCodec class description

9 years agoam 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 20:08:42 +0000 (20:08 +0000)]
am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

* commit '71574a995b9ac66673970b99f12a94cf84901418':
  docs: M Preview - Performance Testing

9 years agoam 96e97b55: am 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into...
Joe Fernandez [Tue, 26 May 2015 20:01:50 +0000 (20:01 +0000)]
am 96e97b55: am 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs

* commit '96e97b5563773c37f4e43ef6121851ce8beb794a':
  docs: M Preview Testing Guide

9 years agoam a04c7d40: Merge "media: Update MediaCodec class description" into mnc-dev
Lajos Molnar [Tue, 26 May 2015 20:01:45 +0000 (20:01 +0000)]
am a04c7d40: Merge "media: Update MediaCodec class description" into mnc-dev

* commit 'a04c7d400c7b9d39b56cec3d705eea39a767370e':
  media: Update MediaCodec class description

9 years agoam b8f3b76a: am 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar...
John Spurlock [Tue, 26 May 2015 20:01:44 +0000 (20:01 +0000)]
am b8f3b76a: am 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev

* commit 'b8f3b76a50b32886608d1ad13171a8cf508fcd4d':
  Zen: Calendar auto-rule tracks primary calendar for corp profile.

9 years agoMerge "docs: M Preview - Performance Testing" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 20:00:56 +0000 (20:00 +0000)]
Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

9 years agodocs: M Preview - Performance Testing
Joe Fernandez [Sat, 23 May 2015 06:53:28 +0000 (23:53 -0700)]
docs: M Preview - Performance Testing

Change-Id: I6b23d83a198528353f60749e07d40a00c051866d

9 years agoam 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview...
Joe Fernandez [Tue, 26 May 2015 19:58:04 +0000 (19:58 +0000)]
am 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs

* commit '37f827db9b3a66f7f4f455011d42c84e610416d6':
  docs: M Preview Testing Guide

9 years agoMerge "media: Update MediaCodec class description" into mnc-dev
Lajos Molnar [Tue, 26 May 2015 19:52:01 +0000 (19:52 +0000)]
Merge "media: Update MediaCodec class description" into mnc-dev

9 years agomedia: Update MediaCodec class description
Lajos Molnar [Fri, 22 May 2015 16:35:58 +0000 (09:35 -0700)]
media: Update MediaCodec class description

Bug: 11990465
Bug: 11019199
Bug: 11990564
Bug: 10672559
Change-Id: I22533dec98fb878ca87876c9ebc0fe59f4bfe995

9 years agoam 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile...
John Spurlock [Tue, 26 May 2015 19:50:07 +0000 (19:50 +0000)]
am 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev

* commit '12e0b390efd2fb8c21a2700be9dcd95d15b31ba6':
  Zen: Calendar auto-rule tracks primary calendar for corp profile.

9 years agoMerge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev
John Spurlock [Tue, 26 May 2015 19:41:51 +0000 (19:41 +0000)]
Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev

9 years agoam c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 19:41:48 +0000 (19:41 +0000)]
am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs

* commit 'c3d171bbe1c55445ff475c63203b4a8eae5e40c7':
  docs: M Preview Testing Guide

9 years agoZen: Calendar auto-rule tracks primary calendar for corp profile.
John Spurlock [Wed, 20 May 2015 13:47:13 +0000 (09:47 -0400)]
Zen: Calendar auto-rule tracks primary calendar for corp profile.

 - Track the calendar provider for the managed profile user if found.
 - Add userId to the shared data structure to disambig calendar ids.
 - Delay rule update a bit to guard against chatty updates.
 - Fix logging in calendar rule.

Bug: 21155107
Change-Id: Id2303fcc39b1fa7417b1844b7869d773ef92434c

9 years agoMerge "docs: M Preview Testing Guide" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 19:26:40 +0000 (19:26 +0000)]
Merge "docs: M Preview Testing Guide" into mnc-preview-docs

9 years agoam a149acfd: am c2ddb3e4: Merge "Switch runtime permission icons to vectors" into...
Jason Monk [Tue, 26 May 2015 19:26:07 +0000 (19:26 +0000)]
am a149acfd: am c2ddb3e4: Merge "Switch runtime permission icons to vectors" into mnc-dev

* commit 'a149acfd0b04102ed78de28d8677dd404bd01690':
  Switch runtime permission icons to vectors

9 years agoam 30b39ca5: am 5c37f1ee: Merge "Remove temporary javadoc for android.media.AudioForm...
Jean-Michel Trivi [Tue, 26 May 2015 19:26:02 +0000 (19:26 +0000)]
am 30b39ca5: am 5c37f1ee: Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev

* commit '30b39ca5bc38fae5ada222366a90dbcefdc29004':
  Remove temporary javadoc for android.media.AudioFormat

9 years agodocs: M Preview Testing Guide
Joe Fernandez [Thu, 21 May 2015 23:31:13 +0000 (16:31 -0700)]
docs: M Preview Testing Guide

A general overview for developers on what to test during the  M Preview

Change-Id: Idbc080482afdaf08c665e4ff2b7e62a84f9b398a

9 years agoam c2ddb3e4: Merge "Switch runtime permission icons to vectors" into mnc-dev
Jason Monk [Tue, 26 May 2015 19:10:25 +0000 (19:10 +0000)]
am c2ddb3e4: Merge "Switch runtime permission icons to vectors" into mnc-dev

* commit 'c2ddb3e452d4d3a360ad697bf89a786f2af7a377':
  Switch runtime permission icons to vectors

9 years agoam 5c37f1ee: Merge "Remove temporary javadoc for android.media.AudioFormat" into...
Jean-Michel Trivi [Tue, 26 May 2015 19:10:21 +0000 (19:10 +0000)]
am 5c37f1ee: Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev

* commit '5c37f1ee57d85185eb36c6f961722f2d39022447':
  Remove temporary javadoc for android.media.AudioFormat

9 years agoMerge "Switch runtime permission icons to vectors" into mnc-dev
Jason Monk [Tue, 26 May 2015 19:04:27 +0000 (19:04 +0000)]
Merge "Switch runtime permission icons to vectors" into mnc-dev

9 years agoMerge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 19:01:19 +0000 (19:01 +0000)]
Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev

9 years agoam b301b64a: am da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev
Abodunrinwa Toki [Tue, 26 May 2015 18:52:01 +0000 (18:52 +0000)]
am b301b64a: am da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev

* commit 'b301b64ae9e1db4e4bc39f4cfd97dbaeaafeec51':
  Support icons in the FloatingToolbar

9 years agoRemove temporary javadoc for android.media.AudioFormat
Jean-Michel Trivi [Tue, 26 May 2015 18:50:11 +0000 (11:50 -0700)]
Remove temporary javadoc for android.media.AudioFormat

Remove temporary text in javadoc for AudioFormat.
Start javadoc for encoding.

Change-Id: I3df5f868da50b8ba4b42a9f054d5cd472f68069d

9 years agoam da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev
Abodunrinwa Toki [Tue, 26 May 2015 18:39:24 +0000 (18:39 +0000)]
am da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev

* commit 'da1b398173a94e94c61a0d186c7dc0ef2a7bd060':
  Support icons in the FloatingToolbar

9 years agoSwitch runtime permission icons to vectors
Jason Monk [Tue, 26 May 2015 18:33:53 +0000 (14:33 -0400)]
Switch runtime permission icons to vectors

Bug: 21367016
Change-Id: I37745eae54e977258b4ec9b184610efd94b268bb

9 years agoMerge "Support icons in the FloatingToolbar" into mnc-dev
Abodunrinwa Toki [Tue, 26 May 2015 18:26:36 +0000 (18:26 +0000)]
Merge "Support icons in the FloatingToolbar" into mnc-dev

9 years agoam a9c7f95b: am 7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev
Alex Klyubin [Tue, 26 May 2015 18:19:21 +0000 (18:19 +0000)]
am a9c7f95b: am 7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev

* commit 'a9c7f95b2a5fb19f8ee475e31691455333c19d41':
  Remove KeyStoreParameter.getContext().

9 years agoam 7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev
Alex Klyubin [Tue, 26 May 2015 18:04:40 +0000 (18:04 +0000)]
am 7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev

* commit '7bf011ab924f465c7a779f4e42fdd4f9d7c6a09a':
  Remove KeyStoreParameter.getContext().

9 years agoam 8164d4c3: am 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager...
Paul Jensen [Tue, 26 May 2015 18:02:14 +0000 (18:02 +0000)]
am 8164d4c3: am 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev

* commit '8164d4c3c601eb341bafb25cf05a069d7029bfed':
  Add javadoc comments mentioning ConnectivityManager API permissions.

9 years agoam a859b09f: am 7891fcb5: Merge "Null-check argument to ConnectivityManager.releaseNe...
Paul Jensen [Tue, 26 May 2015 18:02:09 +0000 (18:02 +0000)]
am a859b09f: am 7891fcb5: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev

* commit 'a859b09f80ba77213cb339fd3267843102dbd4ac':
  Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)

9 years agoMerge "Remove KeyStoreParameter.getContext()." into mnc-dev
Alex Klyubin [Tue, 26 May 2015 17:57:53 +0000 (17:57 +0000)]
Merge "Remove KeyStoreParameter.getContext()." into mnc-dev

9 years agoam 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager API permissio...
Paul Jensen [Tue, 26 May 2015 17:45:36 +0000 (17:45 +0000)]
am 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev

* commit '46ed04de082b18137d879161802fd8512a70e9d4':
  Add javadoc comments mentioning ConnectivityManager API permissions.

9 years agoam 7891fcb5: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest...
Paul Jensen [Tue, 26 May 2015 17:45:32 +0000 (17:45 +0000)]
am 7891fcb5: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev

* commit '7891fcb52a8e0295e3f1d29f534376fd8cbc8d46':
  Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)

9 years agoRemove KeyStoreParameter.getContext().
Alex Klyubin [Tue, 26 May 2015 17:40:15 +0000 (10:40 -0700)]
Remove KeyStoreParameter.getContext().

This method isn't there in the released API and we don't need it in
the new API.

Bug: 18088752
Change-Id: Iccd80715bec782ac3a12bea169df4d37264f66f9

9 years agoam 50b30be2: am 75a857ce: Merge "Handle error states when refreshing accessibility...
Alan Viverette [Tue, 26 May 2015 17:40:12 +0000 (17:40 +0000)]
am 50b30be2: am 75a857ce: Merge "Handle error states when refreshing accessibility node" into mnc-dev

* commit '50b30be28bfb8bdf36835efe10e92f84b85b9b0e':
  Handle error states when refreshing accessibility node

9 years agoam e95b750b: am dfe318d7: Merge "Ringtone picker is not affected by current sonificat...
Jean-Michel Trivi [Tue, 26 May 2015 17:40:07 +0000 (17:40 +0000)]
am e95b750b: am dfe318d7: Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev

* commit 'e95b750bb353bec7f7cbc370a6c883828f7319c9':
  Ringtone picker is not affected by current sonification policy

9 years agoam d4be3a7c: am 7ae3520e: am 59e5d718: am a67fa862: Merge "docs: support library...
Rich Slogar [Tue, 26 May 2015 17:40:03 +0000 (17:40 +0000)]
am d4be3a7c: am 7ae3520e: am 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs

* commit 'd4be3a7c76585bc42d7f5971eacea71ea5f5d4b5':
  docs: support library 22.2 updates

9 years agoam 1a042b55: am 7cd8a7e1: Merge "SysUI: Move LocationControllerImpl receiver to bg...
Jason Monk [Tue, 26 May 2015 17:39:59 +0000 (17:39 +0000)]
am 1a042b55: am 7cd8a7e1: Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev

* commit '1a042b5585a5441273abc6f45138628dea37ae99':
  SysUI: Move LocationControllerImpl receiver to bg

9 years agoam e4d0f67e: am 87d8bb3d: Merge "Unflip TextureView getBitmap readback" into mnc-dev
Chris Craik [Tue, 26 May 2015 17:39:54 +0000 (17:39 +0000)]
am e4d0f67e: am 87d8bb3d: Merge "Unflip TextureView getBitmap readback" into mnc-dev

* commit 'e4d0f67e5f3fa4812ab28d1ad5c7c88e5f28aefc':
  Unflip TextureView getBitmap readback

9 years agoam a2a8eca8: am 1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev
Chet Haase [Tue, 26 May 2015 17:39:48 +0000 (17:39 +0000)]
am a2a8eca8: am 1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev

* commit 'a2a8eca8ddcf2f155363f4d4c41748a0c6eea0f3':
  Clarify example for Deep Share

9 years agoMerge "Add javadoc comments mentioning ConnectivityManager API permissions." into...
Paul Jensen [Tue, 26 May 2015 17:37:32 +0000 (17:37 +0000)]
Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev

9 years agoMerge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent...
Paul Jensen [Tue, 26 May 2015 17:33:24 +0000 (17:33 +0000)]
Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev

9 years agoam 75a857ce: Merge "Handle error states when refreshing accessibility node" into...
Alan Viverette [Tue, 26 May 2015 17:32:54 +0000 (17:32 +0000)]
am 75a857ce: Merge "Handle error states when refreshing accessibility node" into mnc-dev

* commit '75a857cec5f3500954a76f251e81535378ba293a':
  Handle error states when refreshing accessibility node

9 years agoam dfe318d7: Merge "Ringtone picker is not affected by current sonification policy...
Jean-Michel Trivi [Tue, 26 May 2015 17:32:49 +0000 (17:32 +0000)]
am dfe318d7: Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev

* commit 'dfe318d7120b8a1299dda957ad84d29171b583fb':
  Ringtone picker is not affected by current sonification policy

9 years agoam 7ae3520e: am 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates...
Rich Slogar [Tue, 26 May 2015 17:32:43 +0000 (17:32 +0000)]
am 7ae3520e: am 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs

* commit '7ae3520e6fb996d00e90f6cdc55cddff66f3b617':
  docs: support library 22.2 updates

9 years agoMerge "Handle error states when refreshing accessibility node" into mnc-dev
Alan Viverette [Tue, 26 May 2015 17:29:38 +0000 (17:29 +0000)]
Merge "Handle error states when refreshing accessibility node" into mnc-dev

9 years agoMerge "Ringtone picker is not affected by current sonification policy" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 17:27:06 +0000 (17:27 +0000)]
Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev

9 years agoam 72faacb7: am 80370952: Merge "QS: Only show summary for active wifi" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:26:15 +0000 (17:26 +0000)]
am 72faacb7: am 80370952: Merge "QS: Only show summary for active wifi" into mnc-dev

* commit '72faacb70997ed50edabc33f45d65228e18fbea9':
  QS: Only show summary for active wifi

9 years agoam 7cd8a7e1: Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:26:09 +0000 (17:26 +0000)]
am 7cd8a7e1: Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev

* commit '7cd8a7e1bdb0019e52c1eaff7c1c6b17ba0e4719':
  SysUI: Move LocationControllerImpl receiver to bg

9 years agoam 87d8bb3d: Merge "Unflip TextureView getBitmap readback" into mnc-dev
Chris Craik [Tue, 26 May 2015 17:26:05 +0000 (17:26 +0000)]
am 87d8bb3d: Merge "Unflip TextureView getBitmap readback" into mnc-dev

* commit '87d8bb3d85416c28545f94feb1db77875ebe9cf2':
  Unflip TextureView getBitmap readback

9 years agoam 1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev
Chet Haase [Tue, 26 May 2015 17:26:00 +0000 (17:26 +0000)]
am 1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev

* commit '1ddc95ebb244660244681558d16325771ca56b3c':
  Clarify example for Deep Share

9 years agoam 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview...
Rich Slogar [Tue, 26 May 2015 17:23:48 +0000 (17:23 +0000)]
am 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs

* commit '59e5d7189911fc86a65624a337a75d8f840cff3d':
  docs: support library 22.2 updates

9 years agoMerge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:19:09 +0000 (17:19 +0000)]
Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev

9 years agoMerge "Unflip TextureView getBitmap readback" into mnc-dev
Chris Craik [Tue, 26 May 2015 17:19:01 +0000 (17:19 +0000)]
Merge "Unflip TextureView getBitmap readback" into mnc-dev

9 years agoMerge "Clarify example for Deep Share" into mnc-dev
Chet Haase [Tue, 26 May 2015 17:15:57 +0000 (17:15 +0000)]
Merge "Clarify example for Deep Share" into mnc-dev

9 years agoam 80370952: Merge "QS: Only show summary for active wifi" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:13:05 +0000 (17:13 +0000)]
am 80370952: Merge "QS: Only show summary for active wifi" into mnc-dev

* commit '80370952e9008ba3949d6e9bc3412e62a05e1ba3':
  QS: Only show summary for active wifi

9 years agoSysUI: Move LocationControllerImpl receiver to bg
Jason Monk [Tue, 19 May 2015 18:21:28 +0000 (14:21 -0400)]
SysUI: Move LocationControllerImpl receiver to bg

Bug: 19520495
Change-Id: Ia0fbfb663076c296c65bcefdad62d36f98c9e757

9 years agoam a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs
Rich Slogar [Tue, 26 May 2015 17:07:42 +0000 (17:07 +0000)]
am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs

* commit 'a67fa862dc6b46b7642e2abfc2df3146d8be5d98':
  docs: support library 22.2 updates

9 years agoMerge "QS: Only show summary for active wifi" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:01:50 +0000 (17:01 +0000)]
Merge "QS: Only show summary for active wifi" into mnc-dev

9 years agoMerge "docs: support library 22.2 updates" into mnc-preview-docs
Rich Slogar [Tue, 26 May 2015 16:58:41 +0000 (16:58 +0000)]
Merge "docs: support library 22.2 updates" into mnc-preview-docs

9 years agoQS: Only show summary for active wifi
Jason Monk [Tue, 26 May 2015 16:54:12 +0000 (12:54 -0400)]
QS: Only show summary for active wifi

Bug: 20432208
Change-Id: Iedf6e4d102e64c53a633f8d377b5eb57768b1f17

9 years agoam b0e12ac7: am 16224288: Merge "Add constants for permissions granted status api...
Jason Monk [Tue, 26 May 2015 16:53:35 +0000 (16:53 +0000)]
am b0e12ac7: am 16224288: Merge "Add constants for permissions granted status api" into mnc-dev

* commit 'b0e12ac758e4770635cf13d97e97c37b7f5ec812':
  Add constants for permissions granted status api

9 years agoam 477c746e: am 327c3641: Merge "Cancel voice assist session on user switch" into...
James Cook [Tue, 26 May 2015 16:42:06 +0000 (16:42 +0000)]
am 477c746e: am 327c3641: Merge "Cancel voice assist session on user switch" into mnc-dev

* commit '477c746ecca05c83af66060d4b4321ee5976ced1':
  Cancel voice assist session on user switch

9 years agoam 16224288: Merge "Add constants for permissions granted status api" into mnc-dev
Jason Monk [Tue, 26 May 2015 16:41:46 +0000 (16:41 +0000)]
am 16224288: Merge "Add constants for permissions granted status api" into mnc-dev

* commit '16224288791dd3f122931504e624637fdcc70903':
  Add constants for permissions granted status api

9 years agoMerge "Add constants for permissions granted status api" into mnc-dev
Jason Monk [Tue, 26 May 2015 16:32:52 +0000 (16:32 +0000)]
Merge "Add constants for permissions granted status api" into mnc-dev

9 years agoam 327c3641: Merge "Cancel voice assist session on user switch" into mnc-dev
James Cook [Tue, 26 May 2015 16:29:42 +0000 (16:29 +0000)]
am 327c3641: Merge "Cancel voice assist session on user switch" into mnc-dev

* commit '327c364113c18c9d5a05df0c912b65788461da41':
  Cancel voice assist session on user switch

9 years agoMerge "Cancel voice assist session on user switch" into mnc-dev
James Cook [Tue, 26 May 2015 16:16:34 +0000 (16:16 +0000)]
Merge "Cancel voice assist session on user switch" into mnc-dev

9 years agoam 3eeb2b4a: am f981ea95: Merge "Update Statement Service" into mnc-dev
Joseph Wen [Tue, 26 May 2015 15:34:28 +0000 (15:34 +0000)]
am 3eeb2b4a: am f981ea95: Merge "Update Statement Service" into mnc-dev

* commit '3eeb2b4ae3da3e8b16fb8c05b9dbd6df298d96c1':
  Update Statement Service

9 years agoam f981ea95: Merge "Update Statement Service" into mnc-dev
Joseph Wen [Tue, 26 May 2015 15:23:15 +0000 (15:23 +0000)]
am f981ea95: Merge "Update Statement Service" into mnc-dev

* commit 'f981ea95f2e951a558f73fb941cf006423e52627':
  Update Statement Service

9 years agoam df382c91: am b7b7b5ec: Merge "Set error code on failed keyset manifest parsing...
dcashman [Tue, 26 May 2015 15:17:39 +0000 (15:17 +0000)]
am df382c91: am b7b7b5ec: Merge "Set error code on failed keyset manifest parsing." into mnc-dev

* commit 'df382c9118249b22816212832aee7fd730b046f9':
  Set error code on failed keyset manifest parsing.

9 years agoMerge "Update Statement Service" into mnc-dev
Joseph Wen [Tue, 26 May 2015 15:11:08 +0000 (15:11 +0000)]
Merge "Update Statement Service" into mnc-dev

9 years agoam b7b7b5ec: Merge "Set error code on failed keyset manifest parsing." into mnc-dev
dcashman [Tue, 26 May 2015 15:04:37 +0000 (15:04 +0000)]
am b7b7b5ec: Merge "Set error code on failed keyset manifest parsing." into mnc-dev

* commit 'b7b7b5ece86e32a7e5636d0c41c3dee373e8ac5a':
  Set error code on failed keyset manifest parsing.

9 years agoMerge "Set error code on failed keyset manifest parsing." into mnc-dev
dcashman [Tue, 26 May 2015 14:57:24 +0000 (14:57 +0000)]
Merge "Set error code on failed keyset manifest parsing." into mnc-dev

9 years agoAdd constants for permissions granted status api
Jason Monk [Fri, 22 May 2015 18:50:21 +0000 (14:50 -0400)]
Add constants for permissions granted status api

Bug: 21078474
Change-Id: I6b0bcf0c11258ae263eb08366c14f9298798afdb

9 years agoam c137e31a: am 82babcd8: Specify more information in DhcpClient PendingIntents.
Lorenzo Colitti [Tue, 26 May 2015 13:06:31 +0000 (13:06 +0000)]
am c137e31a: am 82babcd8: Specify more information in DhcpClient PendingIntents.

* commit 'c137e31ad340d7cc4360020c47ba0515e4b2f574':
  Specify more information in DhcpClient PendingIntents.

9 years agoam 82babcd8: Specify more information in DhcpClient PendingIntents.
Lorenzo Colitti [Tue, 26 May 2015 12:52:14 +0000 (12:52 +0000)]
am 82babcd8: Specify more information in DhcpClient PendingIntents.

* commit '82babcd83a568f9e938bf8b6b3b86b65e8b30e1f':
  Specify more information in DhcpClient PendingIntents.

9 years agoSpecify more information in DhcpClient PendingIntents.
Lorenzo Colitti [Tue, 26 May 2015 08:31:47 +0000 (17:31 +0900)]
Specify more information in DhcpClient PendingIntents.

- Specify the package name. This provides a bit of security, but
  not much since the package is "android".
- Specify the interface name so we can run more than one client
  at a time.

Bug: 21395858
Bug: 19704592
Change-Id: I91c9ea15285b36628b6aef0b975c16a0b08d061e

9 years agoSupport icons in the FloatingToolbar
Abodunrinwa Toki [Wed, 20 May 2015 21:25:16 +0000 (22:25 +0100)]
Support icons in the FloatingToolbar

Bug: 20202541
Change-Id: Id4d27851739ba557c7f7348094d79f0c5f782e6b

9 years agoam 2c6d1139: am 99fbb56a: Merge "Don\'t count lowmem mappings as memory used." into...
Martijn Coenen [Tue, 26 May 2015 09:50:06 +0000 (09:50 +0000)]
am 2c6d1139: am 99fbb56a: Merge "Don\'t count lowmem mappings as memory used." into mnc-dev

* commit '2c6d11399103ffa9a2e9a25e3abab4b5a711a91a':
  Don't count lowmem mappings as memory used.

9 years agoam 99fbb56a: Merge "Don\'t count lowmem mappings as memory used." into mnc-dev
Martijn Coenen [Tue, 26 May 2015 09:36:25 +0000 (09:36 +0000)]
am 99fbb56a: Merge "Don\'t count lowmem mappings as memory used." into mnc-dev

* commit '99fbb56a0ab81ead404480f0c2df529332a93a32':
  Don't count lowmem mappings as memory used.

9 years agoMerge "Don't count lowmem mappings as memory used." into mnc-dev
Martijn Coenen [Tue, 26 May 2015 08:11:26 +0000 (08:11 +0000)]
Merge "Don't count lowmem mappings as memory used." into mnc-dev

9 years agoam 3b8389a2: am 912696e7: Merge "Fixed logspam and handling subwindows with the input...
Selim Cinek [Tue, 26 May 2015 07:54:39 +0000 (07:54 +0000)]
am 3b8389a2: am 912696e7: Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev

* commit '3b8389a2f00f34cf3e47e3ccdffa70d55a7dc7f7':
  Fixed logspam and handling subwindows with the input consumer

9 years agoam 912696e7: Merge "Fixed logspam and handling subwindows with the input consumer...
Selim Cinek [Tue, 26 May 2015 07:40:59 +0000 (07:40 +0000)]
am 912696e7: Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev

* commit '912696e79785ad26bb2f27354bedce1739f311e3':
  Fixed logspam and handling subwindows with the input consumer

9 years agoMerge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev
Selim Cinek [Tue, 26 May 2015 07:34:17 +0000 (07:34 +0000)]
Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev

9 years agoam f25cc832: am 35bf8322: am 515444ff: am db9274e7: am f8cd49ae: am d580302d: Docs...
David Friedman [Tue, 26 May 2015 06:25:48 +0000 (06:25 +0000)]
am f25cc832: am 35bf8322: am 515444ff: am db9274e7: am f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL 695942.

* commit 'f25cc832027480738f610cf3ec608e2637c12c2a':
  Docs: Submitting fix for build-breaking CL 695942.

9 years agoam 19abfb77: am 337089c8: am e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs...
David Friedman [Tue, 26 May 2015 06:25:43 +0000 (06:25 +0000)]
am 19abfb77: am 337089c8: am e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation

* commit '19abfb779a0d63f8e7b99d512ff8c70d40a4a960':
  Docs: Sample-walkthrough chapters for NDK documentation

9 years agoam 0651e193: am b4ad97fc: am a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge...
Oliver Woodman [Tue, 26 May 2015 06:25:39 +0000 (06:25 +0000)]
am 0651e193: am b4ad97fc: am a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

* commit '0651e193ada712940c6d489d5ca5439a47a15bcb':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.

9 years agoam 6752bf21: am be0742e8: am 4170d9e0: am 165d4585: am 1ccbe54f: am 46350fea: framewo...
Johan Euphrosine [Tue, 26 May 2015 06:25:33 +0000 (06:25 +0000)]
am 6752bf21: am be0742e8: am 4170d9e0: am 165d4585: am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css

* commit '6752bf21318c38f364c846772842799c0cc02aa1':
  frameworks/base/docs/ndk: add missing doxygen css

9 years agoam 35bf8322: am 515444ff: am db9274e7: am f8cd49ae: am d580302d: Docs: Submitting...
David Friedman [Tue, 26 May 2015 06:17:14 +0000 (06:17 +0000)]
am 35bf8322: am 515444ff: am db9274e7: am f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL 695942.

* commit '35bf832248984f92da8de9700ec34ac5e032e116':
  Docs: Submitting fix for build-breaking CL 695942.

9 years agoam 337089c8: am e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthr...
David Friedman [Tue, 26 May 2015 06:17:08 +0000 (06:17 +0000)]
am 337089c8: am e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation

* commit '337089c8d1dc974a24b971fd3e0894086a4e2767':
  Docs: Sample-walkthrough chapters for NDK documentation

9 years agoam b4ad97fc: am a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most...
Oliver Woodman [Tue, 26 May 2015 06:12:52 +0000 (06:12 +0000)]
am b4ad97fc: am a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

* commit 'b4ad97fc193e1a2d5e6254298f176742fbdfddb7':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.

9 years agoam be0742e8: am 4170d9e0: am 165d4585: am 1ccbe54f: am 46350fea: frameworks/base...
Johan Euphrosine [Tue, 26 May 2015 06:12:47 +0000 (06:12 +0000)]
am be0742e8: am 4170d9e0: am 165d4585: am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css

* commit 'be0742e8ee5cf1fe5cce2788c888171452ffe299':
  frameworks/base/docs/ndk: add missing doxygen css

9 years agoam 515444ff: am db9274e7: am f8cd49ae: am d580302d: Docs: Submitting fix for build...
David Friedman [Tue, 26 May 2015 06:04:54 +0000 (06:04 +0000)]
am 515444ff: am db9274e7: am f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL 695942.

* commit '515444ff434ff93c7b5c24bc356973f385e39adf':
  Docs: Submitting fix for build-breaking CL 695942.

9 years agoam e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters...
David Friedman [Tue, 26 May 2015 06:04:49 +0000 (06:04 +0000)]
am e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation

* commit 'e0f14f48416484029a478e17e6b2c5708e0e0010':
  Docs: Sample-walkthrough chapters for NDK documentation

9 years agoam a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer...
Oliver Woodman [Tue, 26 May 2015 06:04:44 +0000 (06:04 +0000)]
am a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

* commit 'a61df8f63c55d96c5443449a9fb538ad97224a52':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.