OSDN Git Service

android-x86/frameworks-base.git
9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Apr 2015 12:10:53 +0000 (05:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibe34266cd7076ba077fae3f629eeda6c4bc583cf
Auto-generated-cl: translation import

9 years agoMerge "Recover status bar enabled state for all users"
Benjamin Franz [Wed, 22 Apr 2015 11:43:01 +0000 (11:43 +0000)]
Merge "Recover status bar enabled state for all users"

9 years agoMerge "Check for null packages in setLockTaskPackages"
Benjamin Franz [Wed, 22 Apr 2015 10:59:59 +0000 (10:59 +0000)]
Merge "Check for null packages in setLockTaskPackages"

9 years agoRecover status bar enabled state for all users
Benjamin Franz [Tue, 21 Apr 2015 13:38:48 +0000 (14:38 +0100)]
Recover status bar enabled state for all users

Move the update of status bar enabled setting to loadSettingsLocked and
thereby recovering the enabled state for all users, not only the user
owner.

Bug: 20416833
Change-Id: Iee3d6e0f3ea8ebc5d72c0ed165bea4595ed073ba

9 years agoMerge "Cleanup unused icons on the floating toolbar."
Andrei Stingaceanu [Wed, 22 Apr 2015 09:25:28 +0000 (09:25 +0000)]
Merge "Cleanup unused icons on the floating toolbar."

9 years agoMerge "Fix permission check imposed by broadcast sender."
Svet Ganov [Wed, 22 Apr 2015 09:16:16 +0000 (09:16 +0000)]
Merge "Fix permission check imposed by broadcast sender."

9 years agoFix permission check imposed by broadcast sender.
Svet Ganov [Wed, 22 Apr 2015 09:14:47 +0000 (02:14 -0700)]
Fix permission check imposed by broadcast sender.

Change-Id: Id105b00aad7b369fa0337fa63753ce7ea71b3383

9 years agoMerge "Stop showing "Replace" when selection isn't inside spans."
Keisuke Kuroyanagi [Wed, 22 Apr 2015 08:31:16 +0000 (08:31 +0000)]
Merge "Stop showing "Replace" when selection isn't inside spans."

9 years agoAlways send the DHCP client identifier.
Lorenzo Colitti [Wed, 22 Apr 2015 06:38:01 +0000 (15:38 +0900)]
Always send the DHCP client identifier.

Currently we send it only in request packets, but not in discover
packets. This might confuse servers because they might think that
the discover and the request come from different clients.

Also reorder the options in the request packet to match the order
used by the legacy DHCP client.

While I'm at it, fix the generation code for inform and decline
packets, which we do not use.

Bug: 19704592
Bug: 20335221
Change-Id: I1d45306e76dbd5da9cc4611e6df84a9f67346b2c

9 years agoStop showing "Replace" when selection isn't inside spans.
Keisuke Kuroyanagi [Mon, 16 Mar 2015 08:44:26 +0000 (17:44 +0900)]
Stop showing "Replace" when selection isn't inside spans.

Currently, "Replace" is shown when any spans intersects
the selection. It causes confusing behavior when multiple
words are selected. "Replace" is in the ActionBar, but it's
unclear which word will be replaced. It can happen when
text is selected using long tap + drag, unig keyboard, or
using a mouse.

Bug: 19396964
Change-Id: I512f5f566d4060cd0aa7b28594054bf4f6bf7458

9 years agoMerge "Log DHCP replies that we can't parse."
Lorenzo Colitti [Wed, 22 Apr 2015 04:12:13 +0000 (04:12 +0000)]
Merge "Log DHCP replies that we can't parse."

9 years agoLog DHCP replies that we can't parse.
Lorenzo Colitti [Wed, 22 Apr 2015 01:50:08 +0000 (10:50 +0900)]
Log DHCP replies that we can't parse.

Bug: 19704592
Bug: 20335221
Change-Id: I73def02a08345bd96f45cb970f9f251e6d5df2db

9 years agoMerge "Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork"
Lorenzo Colitti [Wed, 22 Apr 2015 04:04:54 +0000 (04:04 +0000)]
Merge "Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork"

9 years agoMerge "Allow apps with ACCESS_WIFI_STATE to listen for wifi networks"
Lorenzo Colitti [Wed, 22 Apr 2015 04:04:26 +0000 (04:04 +0000)]
Merge "Allow apps with ACCESS_WIFI_STATE to listen for wifi networks"

9 years agoDon't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork
Lorenzo Colitti [Wed, 22 Apr 2015 02:52:48 +0000 (11:52 +0900)]
Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork

The documentation for setProcessDefaultNetwork does not
mention that it requires ACCESS_NETWORK_STATE, but a process
without ACCESS_NETWORK_STATE that calls it will crash because
we can't fetch the proxy properties.

Because ACCESS_NETWORK_STATE is not required to obtain a Network
object (Network objects can come from broadcasts too), it may not
be reasonable to require the permission. We did not do so in L.

For now, ignore the failure and don't crash the app. I've filed
http://b/20470604 to track a longer term fix.

Bug: 20081183
Bug: 20423580
Bug: 20470604
Change-Id: I158016130b4afb1d300357fe703804d2e7bc609b

9 years agoMerge "Add MetadataSync table to ContactsContract."
Tingting Wang [Wed, 22 Apr 2015 03:25:55 +0000 (03:25 +0000)]
Merge "Add MetadataSync table to ContactsContract."

9 years agoAllow apps with ACCESS_WIFI_STATE to listen for wifi networks
Lorenzo Colitti [Wed, 22 Apr 2015 01:44:49 +0000 (10:44 +0900)]
Allow apps with ACCESS_WIFI_STATE to listen for wifi networks

The compatibility measure introduced in bug 20081183 for apps
that connect to a Wi-Fi network without Internet access and then
expect to be able to use that network requires that such apps
register a NetworkCallback so that their WifiManager can pin them
to whatever wifi Network connects.

Currently, registering the callback requires ACCESS_NETWORK_STATE
and the app may not have that permission. Allow registering wifi
(only) callbacks if the app has ACCESS_WIFI_STATE.

If the app does not have ACCESS_WIFI_STATE (unlikely, since
CHANGE_WIFI_STATE is not very useful without ACCESS_WIFI_STATE),
then don't enable the compatibility measure.

Bug: 20081183
Bug: 20423580
Change-Id: Iad328d30c2d170dead883868fece3d922da68f6f

9 years agoMerge "Report all permissions by type correctly"
Svetoslav [Wed, 22 Apr 2015 01:43:34 +0000 (01:43 +0000)]
Merge "Report all permissions by type correctly"

9 years agoMerge "update API name to requestBandwidthUpdate()"
fenglu [Wed, 22 Apr 2015 01:32:17 +0000 (01:32 +0000)]
Merge "update API name to requestBandwidthUpdate()"

9 years agoam 59338950: (-s ours) am ba75135a: am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimat...
Justin Koh [Wed, 22 Apr 2015 01:07:42 +0000 (01:07 +0000)]
am 59338950: (-s ours) am ba75135a: am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev

* commit '593389501fb3f291eb4b1de4b995318c1ac458b0':
  DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.

9 years agoam 2947926c: (-s ours) am 059451e1: am 23606598: DO NOT MERGE: Reset the Node status...
ztenghui [Wed, 22 Apr 2015 01:07:36 +0000 (01:07 +0000)]
am 2947926c: (-s ours) am 059451e1: am 23606598: DO NOT MERGE: Reset the Node status when clone.

* commit '2947926ce8f15417cebaad936482fc7c18957eaa':
  DO NOT MERGE: Reset the Node status when clone.

9 years agoam ba75135a: am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to...
Justin Koh [Wed, 22 Apr 2015 00:53:38 +0000 (00:53 +0000)]
am ba75135a: am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev

* commit 'ba75135a807c87f4d6c14e69b1246eabd39f4117':
  DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.

9 years agoam 059451e1: am 23606598: DO NOT MERGE: Reset the Node status when clone.
ztenghui [Wed, 22 Apr 2015 00:53:34 +0000 (00:53 +0000)]
am 059451e1: am 23606598: DO NOT MERGE: Reset the Node status when clone.

* commit '059451e18504d6fbbedacaeefe0f2b62b355104d':
  DO NOT MERGE: Reset the Node status when clone.

9 years agoReport all permissions by type correctly
Svetoslav [Wed, 22 Apr 2015 00:52:17 +0000 (17:52 -0700)]
Report all permissions by type correctly

Change-Id: I357ad52d022ffd7703cce7e1551fa10cc7edd72f

9 years agoam 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset...
Justin Koh [Wed, 22 Apr 2015 00:43:16 +0000 (00:43 +0000)]
am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev

* commit '2aa3905cb0cc595783ab43b0bc7a4b3818003958':
  DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.

9 years agoam 23606598: DO NOT MERGE: Reset the Node status when clone.
ztenghui [Wed, 22 Apr 2015 00:43:08 +0000 (00:43 +0000)]
am 23606598: DO NOT MERGE: Reset the Node status when clone.

* commit '23606598244c2a297d994895eaf631b240d33242':
  DO NOT MERGE: Reset the Node status when clone.

9 years agoMerge "Turn of WifiScanner's debug logging"
Vinit Deshpande [Wed, 22 Apr 2015 00:35:28 +0000 (00:35 +0000)]
Merge "Turn of WifiScanner's debug logging"

9 years agoMerge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone...
Justin Koh [Wed, 22 Apr 2015 00:30:59 +0000 (00:30 +0000)]
Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev

9 years agoam 5b0c0964: am fb861b6c: am 31fb202e: Merge "Frameworks/base: Compile-time optimize...
Andreas Gampe [Wed, 22 Apr 2015 00:23:51 +0000 (00:23 +0000)]
am 5b0c0964: am fb861b6c: am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"

* commit '5b0c0964d843319b1b89767cd3d3f1daa984df51':
  Frameworks/base: Compile-time optimize SQLiteConnection

9 years agoam fb861b6c: am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
Andreas Gampe [Wed, 22 Apr 2015 00:12:30 +0000 (00:12 +0000)]
am fb861b6c: am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"

* commit 'fb861b6c8d255fc31f3460e39681a4fee35f156b':
  Frameworks/base: Compile-time optimize SQLiteConnection

9 years agoupdate API name to requestBandwidthUpdate()
fenglu [Wed, 22 Apr 2015 00:12:05 +0000 (17:12 -0700)]
update API name to requestBandwidthUpdate()

Change-Id: If26942978ffcc43f06f17dfad5da790f34758395

9 years agoam 097e1cdf: am 765d7c30: am ba6783b6: Merge "Update getExportedPropertyMethods to...
Mathieu Chartier [Wed, 22 Apr 2015 00:00:23 +0000 (00:00 +0000)]
am 097e1cdf: am 765d7c30: am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"

* commit '097e1cdfb8f3520b22eafb2f0a7458010b1b3415':
  Update getExportedPropertyMethods to new reflection API

9 years agoam 5d3aea2e: am c7f9f765: am 189d2785: Merge "Frameworks/base: Fix comment"
Andreas Gampe [Wed, 22 Apr 2015 00:00:15 +0000 (00:00 +0000)]
am 5d3aea2e: am c7f9f765: am 189d2785: Merge "Frameworks/base: Fix comment"

* commit '5d3aea2e5d052041a81bf49154ceedb9d96e2918':
  Frameworks/base: Fix comment

9 years agoam 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
Andreas Gampe [Tue, 21 Apr 2015 23:59:57 +0000 (23:59 +0000)]
am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"

* commit '31fb202e6f6687f86ec4fc33b18aafacbf67c797':
  Frameworks/base: Compile-time optimize SQLiteConnection

9 years agoMerge "Revert "requestBwUpdate() public API review""
Robert Greenwalt [Tue, 21 Apr 2015 23:59:34 +0000 (23:59 +0000)]
Merge "Revert "requestBwUpdate() public API review""

9 years agoRevert "requestBwUpdate() public API review"
Robert Greenwalt [Tue, 21 Apr 2015 23:59:14 +0000 (23:59 +0000)]
Revert "requestBwUpdate() public API review"

This reverts commit 32f21da41031595a315aaf0eb67f6a094365f2b4.

Change-Id: I8c22d285ff1f56f1bd31a0fa9f2e6a79959347b1

9 years agoMerge "requestBwUpdate() public API review"
Robert Greenwalt [Tue, 21 Apr 2015 23:55:48 +0000 (23:55 +0000)]
Merge "requestBwUpdate() public API review"

9 years agoam 765d7c30: am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection...
Mathieu Chartier [Tue, 21 Apr 2015 23:42:42 +0000 (23:42 +0000)]
am 765d7c30: am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"

* commit '765d7c304871044eaaa92974c295b52faa6244b0':
  Update getExportedPropertyMethods to new reflection API

9 years agoam c7f9f765: am 189d2785: Merge "Frameworks/base: Fix comment"
Andreas Gampe [Tue, 21 Apr 2015 23:42:38 +0000 (23:42 +0000)]
am c7f9f765: am 189d2785: Merge "Frameworks/base: Fix comment"

* commit 'c7f9f7656fc8d3538adddab75f6b1fc48387a719':
  Frameworks/base: Fix comment

9 years agoAdd MetadataSync table to ContactsContract.
Tingting Wang [Tue, 21 Apr 2015 19:04:04 +0000 (12:04 -0700)]
Add MetadataSync table to ContactsContract.

Sync adapter will modify MetadataSync table to cache the metadata_sync
data from server before it is merged into other CP2 tables.

BUG 20055193

Change-Id: I19d31fc19204444432212cc14c9650d41e075648

9 years agoMerge "Frameworks/base: Compile-time optimize SQLiteConnection"
Andreas Gampe [Tue, 21 Apr 2015 23:31:51 +0000 (23:31 +0000)]
Merge "Frameworks/base: Compile-time optimize SQLiteConnection"

9 years agoMerge "Updating the default colors for StackView"
Sunny Goyal [Tue, 21 Apr 2015 23:28:48 +0000 (23:28 +0000)]
Merge "Updating the default colors for StackView"

9 years agoam ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
Mathieu Chartier [Tue, 21 Apr 2015 23:26:49 +0000 (23:26 +0000)]
am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"

* commit 'ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
  Update getExportedPropertyMethods to new reflection API

9 years agoam 189d2785: Merge "Frameworks/base: Fix comment"
Andreas Gampe [Tue, 21 Apr 2015 23:26:41 +0000 (23:26 +0000)]
am 189d2785: Merge "Frameworks/base: Fix comment"

* commit '189d2785c3b71eac9c122c874586501a2ab723b2':
  Frameworks/base: Fix comment

9 years agoam a120e9fc: Merge "Add resources to recyclerview dependency." into lmp-mr1-ub-dev
Deepanshu Gupta [Tue, 21 Apr 2015 23:09:14 +0000 (23:09 +0000)]
am a120e9fc: Merge "Add resources to recyclerview dependency." into lmp-mr1-ub-dev

* commit 'a120e9fcc9eb5b19945a99570ec0c6ddd6433560':
  Add resources to recyclerview dependency.

9 years agoam 8ac2478b: am f7be8b67: am fa147b5c: Merge "[ActivityManager] Move UI operation...
Olawale Ogunwale [Tue, 21 Apr 2015 23:09:06 +0000 (23:09 +0000)]
am 8ac2478b: am f7be8b67: am fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"

* commit '8ac2478b97ccb3f5e94b4df50c935c8f5cdff99c':
  [ActivityManager] Move UI operation to UI handler

9 years agoam 9e6c83ab: am acaa886c: am 0408187e: Merge "[ActivityManager] Avoid unnecessary...
Olawale Ogunwale [Tue, 21 Apr 2015 23:08:50 +0000 (23:08 +0000)]
am 9e6c83ab: am acaa886c: am 0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"

* commit '9e6c83abaf59574ed5c1e9934560ea50abe296be':
  [ActivityManager] Avoid unnecessary restart provider process

9 years agoUpdating the default colors for StackView
Sunny Goyal [Tue, 21 Apr 2015 22:29:10 +0000 (15:29 -0700)]
Updating the default colors for StackView

Change-Id: I595959cf772741dbb91508fd1e3d938443450ed2

9 years agoMerge "Update getExportedPropertyMethods to new reflection API"
Mathieu Chartier [Tue, 21 Apr 2015 23:03:33 +0000 (23:03 +0000)]
Merge "Update getExportedPropertyMethods to new reflection API"

9 years agoTurn of WifiScanner's debug logging
Vinit Deshpande [Tue, 21 Apr 2015 22:59:53 +0000 (15:59 -0700)]
Turn of WifiScanner's debug logging

Bug: 20416721
Change-Id: I48051dbc0bb6e58279ea5ca5dce90d837f1df4e6

9 years agoFrameworks/base: Compile-time optimize SQLiteConnection
Andreas Gampe [Mon, 20 Apr 2015 22:29:04 +0000 (15:29 -0700)]
Frameworks/base: Compile-time optimize SQLiteConnection

Do not cache compiled regular expression and date formatter. Both
cannot be compile-time created, are expensive at preloading time,
and only used in the rare case of dumping the connection (mainly
on errors).

Bug: 19498458
Bug: 19542228
Change-Id: Ia38491a3f852ccf699b815ff05289b338e932f2a

9 years agoMerge "Implement some tests for com.android.documentsui.CopyService."
Ben Kwa [Tue, 21 Apr 2015 22:54:44 +0000 (22:54 +0000)]
Merge "Implement some tests for com.android.documentsui.CopyService."

9 years agoImplement some tests for com.android.documentsui.CopyService.
Ben Kwa [Fri, 17 Apr 2015 01:14:35 +0000 (18:14 -0700)]
Implement some tests for com.android.documentsui.CopyService.

- Add a unit test for CopyService.
- Make some changes to StubProvider to make it more configurable, for
  testing.

Change-Id: I3d726099feaf6b7a3fdd40bf2449f4ee3e848d77

9 years agoMerge "TIF: Cache the stream volume on TvView"
Jae Seo [Tue, 21 Apr 2015 22:36:28 +0000 (22:36 +0000)]
Merge "TIF: Cache the stream volume on TvView"

9 years agorequestBwUpdate() public API review
fenglu [Thu, 16 Apr 2015 20:25:47 +0000 (13:25 -0700)]
requestBwUpdate() public API review

Change-Id: I1e780b2705d13bfc85a0a8712ac1dbd623b474a1

9 years agoMerge "Being extra careful, reset some more variables on ValueAnimator."
ztenghui [Tue, 21 Apr 2015 22:13:01 +0000 (22:13 +0000)]
Merge "Being extra careful, reset some more variables on ValueAnimator."

9 years agoMerge "Document that WebView doesn't honor "uses cleartext traffic" flag."
Alex Klyubin [Tue, 21 Apr 2015 22:11:33 +0000 (22:11 +0000)]
Merge "Document that WebView doesn't honor "uses cleartext traffic" flag."

9 years agoTIF: Cache the stream volume on TvView
Jae Seo [Tue, 21 Apr 2015 17:50:59 +0000 (10:50 -0700)]
TIF: Cache the stream volume on TvView

Also added explanation of the default value.

Bug: 18939663
Change-Id: Idffd45738b0299779c245a11022faadc12004060

9 years agoDocument that WebView doesn't honor "uses cleartext traffic" flag.
Alex Klyubin [Tue, 21 Apr 2015 20:44:29 +0000 (13:44 -0700)]
Document that WebView doesn't honor "uses cleartext traffic" flag.

Bug: 19215516
Change-Id: I5dbbaa03f3cae007c0b9b68fcf8cc8f250c16a62

9 years agoMerge "Make CAPABILITY_CAN_PAUSE_VIDEO public"
Yorke Lee [Tue, 21 Apr 2015 21:49:30 +0000 (21:49 +0000)]
Merge "Make CAPABILITY_CAN_PAUSE_VIDEO public"

9 years agoMerge "More state cleanup in View#draw"
Chris Craik [Tue, 21 Apr 2015 21:47:26 +0000 (21:47 +0000)]
Merge "More state cleanup in View#draw"

9 years agoMore state cleanup in View#draw
Chris Craik [Tue, 21 Apr 2015 21:07:10 +0000 (14:07 -0700)]
More state cleanup in View#draw

bug:20254728

Change-Id: I988077aac59165dd1fcb3ebbcd5abded586256b5

9 years agoCompress the preferred-app backup payloads
Christopher Tate [Mon, 20 Apr 2015 23:09:48 +0000 (16:09 -0700)]
Compress the preferred-app backup payloads

They can be Very Very Large, so take advantage of the new BlobBackupHelper
infrastructure to keep them tiny!

Also fix an issue in which the restore path wasn't properly passing
notification payloads along for processing, and an issue in which the
blob helper wasn't handling empty states properly.

Change-Id: I11a7ca3cd2e26f634a8971e874ac97385b0b500c

9 years agoDO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
ztenghui [Fri, 10 Apr 2015 20:14:17 +0000 (13:14 -0700)]
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.

b/20119270

Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
(cherry picked from commit 26e9a19900bae56b012425a114685d42dfa2fde1)

9 years agoBeing extra careful, reset some more variables on ValueAnimator.
ztenghui [Tue, 21 Apr 2015 21:17:00 +0000 (14:17 -0700)]
Being extra careful, reset some more variables on ValueAnimator.

No real bug found related to these set of variables yet, just a clean up.

b/20457797

Change-Id: I8443718b1c289ccc87e6b227d417825838277361

9 years agoMerge "CEC: Prevent premature standby process completion"
Jinsuk Kim [Tue, 21 Apr 2015 21:12:29 +0000 (21:12 +0000)]
Merge "CEC: Prevent premature standby process completion"

9 years agoMerge "Reset the Node status when clone."
ztenghui [Tue, 21 Apr 2015 21:03:10 +0000 (21:03 +0000)]
Merge "Reset the Node status when clone."

9 years agoMerge "BluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth...
Mike Lockwood [Tue, 21 Apr 2015 20:46:52 +0000 (20:46 +0000)]
Merge "BluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth MIDI timestamps"

9 years agoMake CAPABILITY_CAN_PAUSE_VIDEO public
Yorke Lee [Tue, 21 Apr 2015 20:42:24 +0000 (13:42 -0700)]
Make CAPABILITY_CAN_PAUSE_VIDEO public

Change-Id: If20f642a3d6bda886a68bb1e0ce459c38361a73c

9 years agoMerge "Fix Build:"
Rachad [Tue, 21 Apr 2015 20:39:15 +0000 (20:39 +0000)]
Merge "Fix Build:"

9 years agoMerge "Make activity manager sleep top activity when dreaming."
Jeff Brown [Tue, 21 Apr 2015 20:38:13 +0000 (20:38 +0000)]
Merge "Make activity manager sleep top activity when dreaming."

9 years agoDO NOT MERGE: Reset the Node status when clone.
ztenghui [Tue, 21 Apr 2015 20:00:08 +0000 (13:00 -0700)]
DO NOT MERGE: Reset the Node status when clone.

b/20457797

Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685

9 years agoFix Build:
Rachad [Tue, 21 Apr 2015 20:28:54 +0000 (13:28 -0700)]
Fix Build:

Add overloaded AudioTrack.write() to api/current.txt and api/system-current.txt

Change-Id: I5982e3c19c74dcde1df745137a9eed8ec32efa6a

9 years agoBluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth MIDI...
Mike Lockwood [Tue, 21 Apr 2015 16:33:09 +0000 (09:33 -0700)]
BluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth MIDI timestamps

Also fixed some problems handling timestamp wrapping.

Change-Id: Ic0aefc54f2560425bea6d07ca0c4529d16699eaa

9 years agoReset the Node status when clone.
ztenghui [Tue, 21 Apr 2015 20:00:08 +0000 (13:00 -0700)]
Reset the Node status when clone.

b/20457797

Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685

9 years agoMerge "Add OP_READ_PHONE_STATE app op continued - framework"
Svet Ganov [Tue, 21 Apr 2015 19:52:10 +0000 (19:52 +0000)]
Merge "Add OP_READ_PHONE_STATE app op continued - framework"

9 years agoMerge "Clear emergency dialer task on launch"
Adrian Roos [Tue, 21 Apr 2015 19:47:42 +0000 (19:47 +0000)]
Merge "Clear emergency dialer task on launch"

9 years agoMerge "Blend in force adoptable flag when set."
Jeff Sharkey [Tue, 21 Apr 2015 19:44:59 +0000 (19:44 +0000)]
Merge "Blend in force adoptable flag when set."

9 years agoClear emergency dialer task on launch
Adrian Roos [Mon, 20 Apr 2015 20:57:06 +0000 (13:57 -0700)]
Clear emergency dialer task on launch

Bug: 20344056
Change-Id: Ic26f003acad3f9f91d772e5b4be8bd4b8aff5ec8

9 years agoMerge "AudioTrack.write() with timestamp support"
Rachad [Tue, 21 Apr 2015 19:29:43 +0000 (19:29 +0000)]
Merge "AudioTrack.write() with timestamp support"

9 years agoBlend in force adoptable flag when set.
Jeff Sharkey [Tue, 21 Apr 2015 19:14:03 +0000 (12:14 -0700)]
Blend in force adoptable flag when set.

Bug: 19993667
Change-Id: Ic7f348d171a89e889281b7efb1aa0cbade048975

9 years agoUpdate getExportedPropertyMethods to new reflection API
Mathieu Chartier [Fri, 17 Apr 2015 19:49:57 +0000 (12:49 -0700)]
Update getExportedPropertyMethods to new reflection API

Bug: 19264997

Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce

9 years agoMerge "Add resources to recyclerview dependency."
Deepanshu Gupta [Tue, 21 Apr 2015 18:31:39 +0000 (18:31 +0000)]
Merge "Add resources to recyclerview dependency."

9 years agoAdd resources to recyclerview dependency.
Deepanshu Gupta [Fri, 17 Apr 2015 00:58:37 +0000 (17:58 -0700)]
Add resources to recyclerview dependency.

Change-Id: I03c1dbacf8c83149de3ee01fe6d7dbb288d1948a
(cherry picked from commit 202cbbe45383b871129743d55179cf1c6429fffc)

9 years agoMerge "Make fingerprint enroll/authenticate haptic feedback part of framework."
Jim Miller [Tue, 21 Apr 2015 17:45:51 +0000 (17:45 +0000)]
Merge "Make fingerprint enroll/authenticate haptic feedback part of framework."

9 years agoMerge "Add resources to recyclerview dependency." into lmp-mr1-ub-dev
Deepanshu Gupta [Tue, 21 Apr 2015 17:34:11 +0000 (17:34 +0000)]
Merge "Add resources to recyclerview dependency." into lmp-mr1-ub-dev

9 years agoMerge "Add optional package context to sysui action metrics."
Chris Wren [Tue, 21 Apr 2015 17:24:30 +0000 (17:24 +0000)]
Merge "Add optional package context to sysui action metrics."

9 years agoAdd optional package context to sysui action metrics.
Chris Wren [Tue, 21 Apr 2015 16:34:02 +0000 (12:34 -0400)]
Add optional package context to sysui action metrics.

Bug: 20451514
Change-Id: I3c671d9aa05e02d66168211b77128443c544609d

9 years agoRediscover your own notifications.
Dan Sandler [Wed, 15 Apr 2015 15:02:54 +0000 (11:02 -0400)]
Rediscover your own notifications.

This new API, NotificationManager.getActiveNotifications(),
allows an app to recover the set of notifications it has
posted that are still active (un-cleared, un-canceled,
visible by the user). Along with the Notification object
you'll get the original tag and id you used to post it,
wrapped up in the somewhat awkwardly-named
StatusBarNotification data structure (previously only used
internally by NoMan/SysUI and NotificationListenerServices).

Bug: 17320461
Change-Id: I8cd610956fafed4e31526b663cebdc31231ad930

9 years agoMerge "Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag"
Andrei Kapishnikov [Tue, 21 Apr 2015 16:38:05 +0000 (16:38 +0000)]
Merge "Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag"

9 years agoMerge "Rename native DisplayListRenderer to DisplayListCanvas"
Chris Craik [Tue, 21 Apr 2015 16:30:07 +0000 (16:30 +0000)]
Merge "Rename native DisplayListRenderer to DisplayListCanvas"

9 years agoMerge "TIF: Fix incorrect uses of INPUT_STATE_XXX"
Jae Seo [Tue, 21 Apr 2015 16:13:01 +0000 (16:13 +0000)]
Merge "TIF: Fix incorrect uses of INPUT_STATE_XXX"

9 years agoTIF: Fix incorrect uses of INPUT_STATE_XXX
Jae Seo [Mon, 20 Apr 2015 22:37:50 +0000 (15:37 -0700)]
TIF: Fix incorrect uses of INPUT_STATE_XXX

Also changed TvInputManager.getTvInputState to return
INPUT_STATE_DISCONNECTED for removed inputs and fixed documentation.

Bug: 18563677, Bug: 20435950
Change-Id: Idb81cee852b797eb3f5113d68468905f327928e7

9 years agoMerge "Frameworks/base: Fix comment"
Andreas Gampe [Tue, 21 Apr 2015 16:10:26 +0000 (16:10 +0000)]
Merge "Frameworks/base: Fix comment"

9 years agoam f7be8b67: am fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
Olawale Ogunwale [Tue, 21 Apr 2015 16:08:49 +0000 (16:08 +0000)]
am f7be8b67: am fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"

* commit 'f7be8b6739f174919ad01dcd32788b1b67c6820a':
  [ActivityManager] Move UI operation to UI handler

9 years agoam acaa886c: am 0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider...
Olawale Ogunwale [Tue, 21 Apr 2015 16:08:45 +0000 (16:08 +0000)]
am acaa886c: am 0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"

* commit 'acaa886ce765c58c1e71b440b623a16ae419f5da':
  [ActivityManager] Avoid unnecessary restart provider process

9 years agoMerge "MediaSync: update code example for setCallback."
Wei Jia [Tue, 21 Apr 2015 16:02:57 +0000 (16:02 +0000)]
Merge "MediaSync: update code example for setCallback."

9 years agoFrameworks/base: Fix comment
Andreas Gampe [Tue, 21 Apr 2015 16:01:51 +0000 (09:01 -0700)]
Frameworks/base: Fix comment

Fix comment in ZygoteInit.

Change-Id: I853581c8d44ee52ee8e113c67ea68621643ecb39

9 years agoam 2da31b1e: am 886e8e11: am 2fdd83a9: am d2545775: am 4c20df0b: am 4aebbfbb: Merge...
Luan Nguyen [Tue, 21 Apr 2015 15:59:24 +0000 (15:59 +0000)]
am 2da31b1e: am 886e8e11: am 2fdd83a9: am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit '2da31b1ef75f239ee33fea4592cbf0159a0af8b4':
  docs: Add Channel API summary for Wear.

9 years agoam fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
Olawale Ogunwale [Tue, 21 Apr 2015 15:53:53 +0000 (15:53 +0000)]
am fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"

* commit 'fa147b5caf7b44f76aee515afecda639fbc52c22':
  [ActivityManager] Move UI operation to UI handler