OSDN Git Service

android-x86/frameworks-base.git
9 years agoClear binder identity before dispatching ap op mode changes.
Svet Ganov [Tue, 19 May 2015 19:45:52 +0000 (12:45 -0700)]
Clear binder identity before dispatching ap op mode changes.

bug:21078841

Change-Id: I409b739bbda10542142c8aac1522ad49882f5ec5

9 years agoRevert a deleted file.
Svet Ganov [Sun, 17 May 2015 07:48:57 +0000 (00:48 -0700)]
Revert a deleted file.

Change-Id: I48067da4316762e8a8a4562977c4b84655fdf0f4

9 years agoHide platform platform legacy permissions behind a menu option - framework.
Svet Ganov [Sun, 17 May 2015 05:51:50 +0000 (22:51 -0700)]
Hide platform platform legacy permissions behind a menu option - framework.

bug:21195624

Change-Id: I563c448e2abd7d33070ed2d8f62ba1b60a3744e8

9 years agoMerge "Make unicodeWrap() return null if the input string is null." into mnc-dev
Roozbeh Pournader [Sat, 16 May 2015 18:52:28 +0000 (18:52 +0000)]
Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev

9 years agoMake unicodeWrap() return null if the input string is null.
Roozbeh Pournader [Sat, 16 May 2015 00:34:59 +0000 (17:34 -0700)]
Make unicodeWrap() return null if the input string is null.

Previously, a NullPointerException was raised if the input was null.

Bug: 12894042
Change-Id: I5c5db484e5659659c1da91079adcba773ba7d83d

9 years agoMerge "Fix SoundPool.unload() return value" into mnc-dev
Andy Hung [Sat, 16 May 2015 04:11:07 +0000 (04:11 +0000)]
Merge "Fix SoundPool.unload() return value" into mnc-dev

9 years agoMerge "Mmm mmm mmm mmm." into mnc-dev
Dan Sandler [Sat, 16 May 2015 03:11:52 +0000 (03:11 +0000)]
Merge "Mmm mmm mmm mmm." into mnc-dev

9 years agoMerge "Rename mChannels to mChannelMask" into mnc-dev
Glenn Kasten [Sat, 16 May 2015 02:11:55 +0000 (02:11 +0000)]
Merge "Rename mChannels to mChannelMask" into mnc-dev

9 years agoMerge "SkScalarDiv and its variants are deprecated" into mnc-dev
Jérôme Poichet [Sat, 16 May 2015 02:05:09 +0000 (02:05 +0000)]
Merge "SkScalarDiv and its variants are deprecated" into mnc-dev

9 years agoMerge "AAPT2: Fix layout versioning" into mnc-dev
Adam Lesinski [Sat, 16 May 2015 01:47:07 +0000 (01:47 +0000)]
Merge "AAPT2: Fix layout versioning" into mnc-dev

9 years agoFix SoundPool.unload() return value
Andy Hung [Sat, 16 May 2015 01:39:09 +0000 (18:39 -0700)]
Fix SoundPool.unload() return value

Bug: 21209627
Change-Id: Ifd5c5f349894744c192cad10c5c875882566ec53

9 years agoOBEX: Handle GET operation properly
Hemant Gupta [Fri, 30 May 2014 16:55:20 +0000 (22:25 +0530)]
OBEX: Handle GET operation properly

This change handles GET operation properly whenever the
Input stream is getting aborted in between. Without this
patch it was observed that GET request was being sent by
DUT even when abort has been sent/received resulting
in IOT issues with some remote devices including PTS.

Change-Id: Idcb4ea04abb57353af5ab1fef050b3a36579892e

9 years agoMerge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev
Robert Shih [Sat, 16 May 2015 01:08:50 +0000 (01:08 +0000)]
Merge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev

9 years agoMerge "Hold wakelock while dexopting" into mnc-dev
Fyodor Kupolov [Sat, 16 May 2015 00:26:07 +0000 (00:26 +0000)]
Merge "Hold wakelock while dexopting" into mnc-dev

9 years agoMediaPlayer: clean up subtitle controller log spam
Robert Shih [Fri, 15 May 2015 23:56:51 +0000 (16:56 -0700)]
MediaPlayer: clean up subtitle controller log spam

- create a default SubtitleController if not set explicitly
- log warning instead of error

Bug: 17594306
Change-Id: Ie7084205b3555bdfec0a2940d0e56398f778585a

9 years agoMerge "BatteryStats: Enable bluetooth energy collection" into mnc-dev
Adam Lesinski [Fri, 15 May 2015 22:57:01 +0000 (22:57 +0000)]
Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev

9 years agoBatteryStats: Enable bluetooth energy collection
Adam Lesinski [Fri, 15 May 2015 22:49:24 +0000 (15:49 -0700)]
BatteryStats: Enable bluetooth energy collection

Device firmware has been fixed and bluetooth energy values
should be correct now.

Change-Id: I9b9eff378d81e8de4a3f475c071a4ef26cc97f21

9 years agoMerge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev
Zach Johnson [Fri, 15 May 2015 22:40:26 +0000 (22:40 +0000)]
Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev

9 years agoMerge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java...
Paul Mclean [Fri, 15 May 2015 22:28:31 +0000 (22:28 +0000)]
Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev

9 years agoRevert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"
Paul Mclean [Fri, 15 May 2015 22:28:07 +0000 (22:28 +0000)]
Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"

This reverts commit 34f5e042904c22643f96d4466caa003073708b62.

Change-Id: Ie2a00ef26b20a662fb0e801925a3721804e427ba

9 years agoMerge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev
Alan Viverette [Fri, 15 May 2015 22:25:39 +0000 (22:25 +0000)]
Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev

9 years agoMerge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into...
Alan Viverette [Fri, 15 May 2015 22:25:25 +0000 (22:25 +0000)]
Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev

9 years agoMerge "DOn't save encryption settings when not encrypted" into mnc-dev
Paul Lawrence [Fri, 15 May 2015 22:22:18 +0000 (22:22 +0000)]
Merge "DOn't save encryption settings when not encrypted" into mnc-dev

9 years agoMerge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" into mnc-dev
Adam Lesinski [Fri, 15 May 2015 22:18:58 +0000 (22:18 +0000)]
Merge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" into mnc-dev

9 years agoBatteryStatsHelper: Bluetooth wasn't being included in usage list
Adam Lesinski [Thu, 14 May 2015 20:57:08 +0000 (13:57 -0700)]
BatteryStatsHelper: Bluetooth wasn't being included in usage list

Bug:20892246
Change-Id: I6eaf204a2cd970ff75704be22c9006fe4dc696cd

9 years agoMerge "MediaDrm API Updates per api council review" into mnc-dev
Jeff Tinker [Fri, 15 May 2015 22:13:32 +0000 (22:13 +0000)]
Merge "MediaDrm API Updates per api council review" into mnc-dev

9 years agoMerge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into...
Paul McLean [Fri, 15 May 2015 22:09:07 +0000 (22:09 +0000)]
Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev

9 years agoAddeding try/catch to card#/device# parsing in AlsaDevicesParser.java
Paul McLean [Fri, 15 May 2015 20:57:03 +0000 (13:57 -0700)]
Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java

Not the cause of, but related to...
Bug: 19082426

Change-Id: I296c67989debc932838b39d63fdb57396448c50c

9 years agoMerge changes from topic 'bench' into mnc-dev
Jeff Sharkey [Fri, 15 May 2015 21:55:51 +0000 (21:55 +0000)]
Merge changes from topic 'bench' into mnc-dev

* changes:
  Command to change force adoptable state.
  Initial pass at storage benchmarks.

9 years agoAllow getChangingConfigurations() on DrawableWrapper with null drawable
Alan Viverette [Fri, 15 May 2015 21:53:03 +0000 (14:53 -0700)]
Allow getChangingConfigurations() on DrawableWrapper with null drawable

Change-Id: Iecf39b53419e07927a3fe3096036a57afd69439a

9 years agoMerge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev
Adam Lesinski [Fri, 15 May 2015 21:24:59 +0000 (21:24 +0000)]
Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev

9 years agoMerge "Parse uid_cputime proc file" into mnc-dev
Adam Lesinski [Fri, 15 May 2015 21:23:07 +0000 (21:23 +0000)]
Merge "Parse uid_cputime proc file" into mnc-dev

9 years agoReturn correct year in DayPickerPagerAdapter.getYearForPosition()
Alan Viverette [Fri, 15 May 2015 21:18:44 +0000 (14:18 -0700)]
Return correct year in DayPickerPagerAdapter.getYearForPosition()

Previously it wasn't offsetting the position by the min date's month,
so it would be off by a year if the min date wasn't in January. Also
now updates button visibility whenever the ViewPager's range changes.

Bug: 21203303
Change-Id: Id7a41a4fa48843943c744fb0fecd4bebb798cee5

9 years agoCommand to change force adoptable state.
Jeff Sharkey [Fri, 15 May 2015 20:45:00 +0000 (13:45 -0700)]
Command to change force adoptable state.

Since user builds can't setprop, add an explicit "sm" verb to change
the force adoptable state.

Bug: 21191915
Change-Id: I719d9b18c1a98c97442a5ddb1cc5512e8e4d3d3f

9 years agoMerge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into...
Adam Powell [Fri, 15 May 2015 21:00:59 +0000 (21:00 +0000)]
Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev

9 years agoPreserve ResolverDrawerLayout fully collapsed state across relayout
Adam Powell [Fri, 15 May 2015 20:39:22 +0000 (13:39 -0700)]
Preserve ResolverDrawerLayout fully collapsed state across relayout

Fix a bug where a relayout that grows the size of ResolverDrawerLayout
content would cause it to get stuck in a half-collapsed state. This
could also lead to janky touch interaction behavior in
onStopNestedScroll as it animates to the fully open/closed state after
clicking in a descendant list.

Bug 21202727

Change-Id: I5f0a8b19fc079c57fcf2be7c6fa7627b1cb12a3c

9 years agoMerge "Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated...
David Christie [Fri, 15 May 2015 20:50:54 +0000 (20:50 +0000)]
Merge "Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated before looper thread  is ready. Bug: 21185178" into mnc-dev

9 years agoInitial pass at storage benchmarks.
Jeff Sharkey [Fri, 15 May 2015 04:07:42 +0000 (21:07 -0700)]
Initial pass at storage benchmarks.

Offer an interface for Settings to invoke benchmarks on various
attached volumes.

Bug: 21172095
Change-Id: I847ddc87c58285457d1324be87f70ce10507accb

9 years agoMerge "Clean-up broadcast receivers when component is disabled." into mnc-dev
Wale Ogunwale [Fri, 15 May 2015 20:35:39 +0000 (20:35 +0000)]
Merge "Clean-up broadcast receivers when component is disabled." into mnc-dev

9 years agoMerge "Fix lost singleton provider after force-stopping user or package." into mnc-dev
Olawale Ogunwale [Fri, 15 May 2015 20:34:18 +0000 (20:34 +0000)]
Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev

9 years agoMerge "Also restart provider if there is external handle." into mnc-dev
Olawale Ogunwale [Fri, 15 May 2015 20:33:47 +0000 (20:33 +0000)]
Merge "Also restart provider if there is external handle." into mnc-dev

9 years agoClean-up broadcast receivers when component is disabled.
Wale Ogunwale [Fri, 15 May 2015 19:49:13 +0000 (12:49 -0700)]
Clean-up broadcast receivers when component is disabled.

Bug: 15804187
Change-Id: Ib672f720bd5c8d81d3846568ef53f7723685f317

9 years agoFix issue where GeofenceHardwareImpl can crash.
David Christie [Fri, 15 May 2015 20:23:08 +0000 (13:23 -0700)]
Fix issue where GeofenceHardwareImpl can crash.
-It can't be instantiated before looper thread
 is ready.
Bug: 21185178

Change-Id: I9e5434f7821c608a01bfd962c5482f6c2c2a022d

9 years agoMerge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev
Alan Viverette [Fri, 15 May 2015 20:10:21 +0000 (20:10 +0000)]
Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev

9 years agoMmm mmm mmm mmm.
Dan Sandler [Fri, 15 May 2015 19:08:34 +0000 (15:08 -0400)]
Mmm mmm mmm mmm.

Change-Id: I23b560694b9cc0eb2103ec16769b0446099d1e83

9 years agoMerge "Fix testAuthNeeded test" into mnc-dev
Chad Brubaker [Fri, 15 May 2015 19:37:25 +0000 (19:37 +0000)]
Merge "Fix testAuthNeeded test" into mnc-dev

9 years agoMerge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev
Selim Gurun [Fri, 15 May 2015 18:47:43 +0000 (18:47 +0000)]
Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev

9 years agoMerge "Adjust light source for window position" into mnc-dev
Alan Viverette [Fri, 15 May 2015 18:31:40 +0000 (18:31 +0000)]
Merge "Adjust light source for window position" into mnc-dev

9 years agoInvalidate old accessibility bounds on CONTENT_CHANGE
Alan Viverette [Fri, 15 May 2015 18:30:21 +0000 (11:30 -0700)]
Invalidate old accessibility bounds on CONTENT_CHANGE

Bug: 20950124
Change-Id: Id19924358b538f9b7754de3a0c019433817dc1fc

9 years agoFix testAuthNeeded test
Chad Brubaker [Thu, 7 May 2015 18:31:32 +0000 (11:31 -0700)]
Fix testAuthNeeded test

begin now returns OP_AUTH_REQUIRED for per operations with per op
authorization instead of NO_ERROR.

(cherry-picked from commit b0addbaaf22b14200db602c41a5bd86847bdc0a9)

Change-Id: I1f472125f46155833e03ab30bf18363ff51b2c58

9 years agoDOn't save encryption settings when not encrypted
Paul Lawrence [Fri, 15 May 2015 18:26:17 +0000 (11:26 -0700)]
DOn't save encryption settings when not encrypted

If this setting is saved when unencrypted, it will apply after encryption
and cause the user to get the wrong default in the 'Require pattern to start
device' dialog.

Bug: 21105662
Change-Id: Ibd2918abb6af27e20dc03a1a10f4cad1033bc575

9 years agoMerge "Remove "encrypt at rest" flag from new AndroidKeyStore API." into mnc-dev
Alex Klyubin [Fri, 15 May 2015 18:23:00 +0000 (18:23 +0000)]
Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API." into mnc-dev

9 years agoRemove "encrypt at rest" flag from new AndroidKeyStore API.
Alex Klyubin [Fri, 15 May 2015 17:47:18 +0000 (10:47 -0700)]
Remove "encrypt at rest" flag from new AndroidKeyStore API.

This flag causes issues such as being unable to generate, import, or
use keys when the user/profile secure lock screen credential hasn't
yet been entered after boot.

Bug: 18088752
Change-Id: I992f6dfdc945bcb83e341356a40dfa7d7bc143d8

9 years agoRename PostMessageToMainFrame to PostWebMessage
Selim Gurun [Fri, 15 May 2015 18:02:45 +0000 (11:02 -0700)]
Rename PostMessageToMainFrame to PostWebMessage

Bug: 20557074

There is no need to keep the name PostMessageToMainFrame since
we may choose to not implement the special condition to posting
to a named subframe. And if we want, we can do this by overloading
the function.

Change-Id: I9896ad479e1c30cda500352cfdb1b7d336383568

9 years agoMerge "Text selection: Fix moving by character when should move by word" into mnc-dev
Mady Mellor [Fri, 15 May 2015 17:56:34 +0000 (17:56 +0000)]
Merge "Text selection: Fix moving by character when should move by word" into mnc-dev

9 years agoMerge "Fix difficulty grabbing handles for small selections" into mnc-dev
Mady Mellor [Fri, 15 May 2015 17:56:48 +0000 (17:56 +0000)]
Merge "Fix difficulty grabbing handles for small selections" into mnc-dev

9 years agoMerge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-dev
Yohei Yukawa [Fri, 15 May 2015 17:40:39 +0000 (17:40 +0000)]
Merge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-dev

9 years agoRevert "Fix IMMS#mInputShown state inconsistency."
Yohei Yukawa [Fri, 15 May 2015 17:30:12 +0000 (10:30 -0700)]
Revert "Fix IMMS#mInputShown state inconsistency."

This reverts commit 8d4a9117fbd0aaf03b8486ef920c73894a12cfcd.

Because of a regression Bug 21161785.

Bug: 21161785
Bug: 18722991
Bug: 20763994
Bug: 20764441
Bug: 20926844
Change-Id: If58612eda08764be0226832c0a73f03683889cdb

9 years agoFix lost singleton provider after force-stopping user or package.
riddle_hsu [Fri, 15 May 2015 03:33:03 +0000 (11:33 +0800)]
Fix lost singleton provider after force-stopping user or package.

Case 1 (name == null):
Switch user from guest to owner. All processes of guest
will be killed, it will not include processes which singleton
components live in, but singleton provider records are still
collected and removed.

When the user switch is complete and the process of removed
singleton provider is still alive, there is someone access
the provider, it will create a new ContentProviderRecord and
wait but no one will notify it because the provider process
is alive with different ContentProviderRecord.

Then the access cannot get response unless the process of target
provider is died and restarted.

Case 2 (name != null):
Switch to another non-guest user, launch an application which
contains singleton provider. Go to Settings to force-stop the
package then switch back to owner user. Launch an application
which will access the singleton provider. It will also cannot
get response that similar as case 1.

Solution:
Only collect singleton provider if target user is all or owner.

Change-Id: Ic6828da66645172d1378cfb1f66d092df5966516

9 years agoam 7414f97a: am efd254b2: Doc change: fix urls, remove obsolete image.
Dirk Dougherty [Fri, 15 May 2015 16:46:24 +0000 (16:46 +0000)]
am 7414f97a: am efd254b2: Doc change: fix urls, remove obsolete image.

* commit '7414f97a04658858201760c3a60a9d8fa95042fa':
  Doc change: fix urls, remove obsolete image.

9 years agoam 3519ddfe: am de401c82: Doc change: More changes to distribute files, Google Servic...
Dirk Dougherty [Fri, 15 May 2015 16:46:18 +0000 (16:46 +0000)]
am 3519ddfe: am de401c82: Doc change: More changes to distribute files, Google Services page update.

* commit '3519ddfe07de5847332937c4a0ba29c0378fe26a':
  Doc change: More changes to distribute files, Google Services page update.

9 years agoMerge "Update button visibility as a final step in DayPickerView construction" into...
Alan Viverette [Fri, 15 May 2015 16:44:21 +0000 (16:44 +0000)]
Merge "Update button visibility as a final step in DayPickerView construction" into mnc-dev

9 years agoMerge "Revert "Strip PNG metadata"" into mnc-dev
Alan Viverette [Fri, 15 May 2015 16:43:00 +0000 (16:43 +0000)]
Merge "Revert "Strip PNG metadata"" into mnc-dev

9 years agoRevert "Strip PNG metadata"
Alan Viverette [Fri, 15 May 2015 16:41:26 +0000 (16:41 +0000)]
Revert "Strip PNG metadata"

Removing the color profiles significantly changed the
appearance of some assets.

This reverts commit fe1ca2c535816bf7528b8b77fb5c24f9db324671.

Change-Id: I60d9b645eda927b0fc5adc8b2bd0902fb536208a

9 years agoMerge "Fix easter egg setting validator to accept valid values" into mnc-dev
Svet Ganov [Fri, 15 May 2015 16:34:53 +0000 (16:34 +0000)]
Merge "Fix easter egg setting validator to accept valid values" into mnc-dev

9 years agoFix easter egg setting validator to accept valid values
Svet Ganov [Fri, 15 May 2015 16:32:55 +0000 (09:32 -0700)]
Fix easter egg setting validator to accept valid values

bug:21188928

Change-Id: I5f6d445aad7231a907026c552c87f9cdfe024d32

9 years agoAlso restart provider if there is external handle.
riddle_hsu [Wed, 13 May 2015 10:59:03 +0000 (18:59 +0800)]
Also restart provider if there is external handle.

e.g. ContentResolver.getType will call
ActivityManagerService.getProviderMimeType
that will not have connection but increase
externalProcessNoHandleCount.

Change-Id: I649c0b2390a749c77c6be5e7dfadc1acb689ec4c

9 years agoMerge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-dev
Zhijun He [Fri, 15 May 2015 16:03:30 +0000 (16:03 +0000)]
Merge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-dev

9 years agoMerge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev
Paul McLean [Fri, 15 May 2015 14:35:48 +0000 (14:35 +0000)]
Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev

9 years agoMerge "Add bluetooth permission annotations" into mnc-dev
Tor Norbye [Fri, 15 May 2015 14:21:12 +0000 (14:21 +0000)]
Merge "Add bluetooth permission annotations" into mnc-dev

9 years agoMerge "Remove hidden/deleted APIs." into mnc-dev
George Mount [Fri, 15 May 2015 14:08:17 +0000 (14:08 +0000)]
Merge "Remove hidden/deleted APIs." into mnc-dev

9 years agoIcon support comes to Notification.
Dan Sandler [Wed, 6 May 2015 19:18:49 +0000 (15:18 -0400)]
Icon support comes to Notification.

  And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

(This patch fixes a number of bugs in the initial
implementation, but other than that, it's the same as it
ever was.)

Bug: 18568715
Bug: 21141842
Change-Id: I1d3f9427abd7f0bb57e533fcfac708851ff644b6

9 years agoMerge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev
Dan Sandler [Fri, 15 May 2015 04:39:41 +0000 (04:39 +0000)]
Merge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev

9 years agoAAPT2: Fix layout versioning
Adam Lesinski [Fri, 15 May 2015 00:58:14 +0000 (17:58 -0700)]
AAPT2: Fix layout versioning

Change-Id: I37190cf8a1f0a81c068aeb2b5326b3b3080f75a5

9 years agoMerge "Fix bug with jobservice context giving wrong value" into mnc-dev
Matthew Williams [Fri, 15 May 2015 03:51:57 +0000 (03:51 +0000)]
Merge "Fix bug with jobservice context giving wrong value" into mnc-dev

9 years agoFix bug with jobservice context giving wrong value
Matthew Williams [Fri, 15 May 2015 00:47:33 +0000 (17:47 -0700)]
Fix bug with jobservice context giving wrong value

BUG: 20614145
Change-Id: Ibd555732e03646d6d59e6d0effa9f92ec70ca3c4

9 years agoMerge "Statically import NetworkCapabilities constants for brevity." into mnc-dev
Lorenzo Colitti [Fri, 15 May 2015 03:37:22 +0000 (03:37 +0000)]
Merge "Statically import NetworkCapabilities constants for brevity." into mnc-dev

9 years agoam efd254b2: Doc change: fix urls, remove obsolete image.
Dirk Dougherty [Fri, 15 May 2015 03:22:53 +0000 (03:22 +0000)]
am efd254b2: Doc change: fix urls, remove obsolete image.

* commit 'efd254b2f9246d4c259be7885ef344be745bc8bc':
  Doc change: fix urls, remove obsolete image.

9 years agoam de401c82: Doc change: More changes to distribute files, Google Services page update.
Dirk Dougherty [Fri, 15 May 2015 03:17:37 +0000 (03:17 +0000)]
am de401c82: Doc change: More changes to distribute files, Google Services page update.

* commit 'de401c82f58a9465593391fede942fe6ffd22ef1':
  Doc change: More changes to distribute files, Google Services page update.

9 years agoDoc change: fix urls, remove obsolete image.
Dirk Dougherty [Fri, 15 May 2015 03:14:34 +0000 (20:14 -0700)]
Doc change: fix urls, remove obsolete image.

Change-Id: I61ec972b1df2c3211da6e21ee4e4ec3319d0d02b

9 years agoDoc change: More changes to distribute files, Google Services page update.
Dirk Dougherty [Sat, 9 May 2015 19:10:56 +0000 (12:10 -0700)]
Doc change: More changes to distribute files, Google Services page update.

Change-Id: I047ff9165c5844075561b31e42f8127d8819aeb0

9 years agoMerge "TIF: Remove incorrect audio mode check" into mnc-dev
Jae Seo [Fri, 15 May 2015 02:44:21 +0000 (02:44 +0000)]
Merge "TIF: Remove incorrect audio mode check" into mnc-dev

9 years agoTIF: Remove incorrect audio mode check
Jae Seo [Fri, 15 May 2015 02:16:30 +0000 (19:16 -0700)]
TIF: Remove incorrect audio mode check

Bug: 21170680
Change-Id: If50181294d7b2977d8e0735ae4d118943e0aad60

9 years agoMerge "fullBackupContent isn't public API" into mnc-dev
Christopher Tate [Fri, 15 May 2015 01:50:38 +0000 (01:50 +0000)]
Merge "fullBackupContent isn't public API" into mnc-dev

9 years agoMerge "camera2: Fix work-profile eviction handling." into mnc-dev
Ruben Brunk [Fri, 15 May 2015 01:45:18 +0000 (01:45 +0000)]
Merge "camera2: Fix work-profile eviction handling." into mnc-dev

9 years agoMediaDrm API Updates per api council review
Jeff Tinker [Wed, 13 May 2015 23:53:52 +0000 (16:53 -0700)]
MediaDrm API Updates per api council review

bug: 21044671

Change-Id: Ifb34e7b8cb53f7bd5737c0869fc6c1f731ba1c9c

9 years agoMerge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 01:40:09 +0000 (01:40 +0000)]
Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-dev

9 years agocamera2: Fix work-profile eviction handling.
Ruben Brunk [Fri, 1 May 2015 00:46:30 +0000 (17:46 -0700)]
camera2: Fix work-profile eviction handling.

Bug: 20124384

Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8

9 years agoMerge "Fix missing break in Icon class" into mnc-dev
Yorke Lee [Fri, 15 May 2015 01:39:03 +0000 (01:39 +0000)]
Merge "Fix missing break in Icon class" into mnc-dev

9 years agoFix in-call UI crash on Nova devcies (framework/base)
Sailesh Nepal [Fri, 15 May 2015 01:28:10 +0000 (18:28 -0700)]
Fix in-call UI crash on Nova devcies (framework/base)

If a status hint icon wasn't set we'd crash.
Fix was to set StatusHitns.mIcon to null if the icon resource ID'
was 0.

BUG: 21168985
Change-Id: I33c06169f9e184b063e6fd10f77408bc262ea3c8

9 years agoFix missing break in Icon class
Yorke Lee [Fri, 15 May 2015 01:22:02 +0000 (18:22 -0700)]
Fix missing break in Icon class

This causes RuntimeExceptions to fall through to the next
case statement.

Bug: 21168985
Change-Id: Ie69610b22c6caf9f6536ebd48673067880cb75a2

9 years agoAdjust light source for window position
Alan Viverette [Fri, 15 May 2015 01:05:36 +0000 (18:05 -0700)]
Adjust light source for window position

Bug: 16523629
Change-Id: I2f3fed1edcac0a3cfd5034aded45e08ececfebaf

9 years agoMerge "Fix post dial for remote connections" into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 00:55:39 +0000 (00:55 +0000)]
Merge "Fix post dial for remote connections" into mnc-dev

9 years agoFix post dial for remote connections
Sailesh Nepal [Fri, 15 May 2015 00:39:41 +0000 (17:39 -0700)]
Fix post dial for remote connections

Use the correct callback (onPostDialChar instead of onPostDialWait).
This fixes a bug where every remote call would prompt the user
to send tones after the call became active.

BUG: 21004101
Change-Id: I1656a4266d0028ef29494a3cee169180267e16cd

9 years agoMerge "Start AnimationDrawable from the zeroth frame." into mnc-dev
Doris Liu [Fri, 15 May 2015 00:28:32 +0000 (00:28 +0000)]
Merge "Start AnimationDrawable from the zeroth frame." into mnc-dev

9 years agoStart AnimationDrawable from the zeroth frame.
Doris Liu [Thu, 14 May 2015 22:12:23 +0000 (15:12 -0700)]
Start AnimationDrawable from the zeroth frame.

This CL fixes the issue where when start is called, we run the next frame
of the animation drawable while mCurFrame is already set to 0. The result
is that the first frame of the AnimationDrawable is then skipped.

Bug: 21168854
Change-Id: I2b77ae017d3debd0f8cfec81ea86d1120e78bb55

9 years agoAdd bluetooth permission annotations
Tor Norbye [Fri, 24 Apr 2015 00:10:21 +0000 (17:10 -0700)]
Add bluetooth permission annotations

Change-Id: I5bc86f8ec6ea5c873f1e14dab0e0c47c5c9df7f7

9 years agoMerge "Fix build: udpate parser factory method" into mnc-dev
Deepanshu Gupta [Fri, 15 May 2015 00:01:51 +0000 (00:01 +0000)]
Merge "Fix build: udpate parser factory method" into mnc-dev

9 years agoFix build: udpate parser factory method
Deepanshu Gupta [Fri, 15 May 2015 00:00:50 +0000 (17:00 -0700)]
Fix build: udpate parser factory method

Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544

9 years agoMerge "Check for setting to already set" into mnc-dev
John Reck [Thu, 14 May 2015 23:27:47 +0000 (23:27 +0000)]
Merge "Check for setting to already set" into mnc-dev