143172 Commits

Author SHA1 Message Date
Deepanshu Gupta
0dfccbc911 am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev
* commit '0804e0aded17c1aee8cbd2c34247b390051123c3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-19 00:41:35 +00:00
Deepanshu Gupta
e4e37ed5cc am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
* commit 'd7f2bf067fce644ed902122fffb9e22b6596a0ff':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-19 00:41:31 +00:00
Guang Zhu
7d41c138d2 am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
* commit 'f59ce46880ebe2c2466a2c862ec2ed401f635d51':
  add command to enable bt snoop log
2014-07-19 00:33:58 +00:00
Jean-Michel Trivi
7f6ee760b0 Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide AudioFormat.Builder
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide the missing two channels that enable a 7.1 configuration

Change-Id: I60899548da1c688ebe561c25212877e0f3eedb34
2014-07-18 17:07:04 -07:00
Jean-Michel Trivi
044a5f51e5 Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev 2014-07-17 21:58:28 +00:00
Santos Cordon
6b45642f36 Fixing ADD_CALL (1/3)
Bug: 16241726
Change-Id: Ie1dd72a79c2430b10b0239dbdda5508edbc8eb26
2014-07-19 00:23:21 +00:00
Jean-Michel Trivi
0daab220b2 Hide AudioManager.startBluetoothScoVirtualCall()
Not intended for public consumption.

Bug 16401631

Change-Id: I299a4719fef57a66a428ccf1902aefaf59d7e064
2014-07-18 16:47:25 -07:00
Andre Eisenbach
b3db5eb4f0 Merge "Reduce GATT logging output" into lmp-dev 2014-07-18 18:24:25 +00:00
Andre Eisenbach
55d19e495e Reduce GATT logging output
Change-Id: Iefdf101ac849e45bf50c55ce5999364f5fbd24a4
2014-07-18 14:38:36 -07:00
Andre Eisenbach
6ce4db0acf LE: Add connection parameter update request API (4/4)
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
2014-07-18 12:13:46 -07:00
Chris Craik
f251bde890 Merge "Tweaks to outline API" into lmp-dev 2014-07-17 21:58:28 +00:00
Chris Craik
31ba192dd2 Tweaks to outline API
b/15283203
b/16142564

Remove boolean return value chaining, as it's redundant with
the data in the Outline itself.

Change-Id: I3116e57cd1b35c98b74e95195117edd7e39fb2df
2014-07-19 00:13:59 +00:00
Christopher Tate
1787d9c51e Merge "Tear down agents properly at EOD in full restore" into lmp-dev 2014-07-17 21:58:28 +00:00
Winson Chung
3e3365babd Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100) 2014-07-18 18:49:53 +00:00
Christopher Tate
89101f7fe8 Tear down agents properly at EOD in full restore
The restore engine wasn't tearing down the bound agent after reaching
the end of data for the app, and furthermore was allowing the restore
operation to resume running the queue before all data had been delivered
to the current target.

Also make LocalTransport deliver data in 2K chunks rather than 32K,
as a first step towards making its timing characteristics more like
we'll see in networked situations.

Finally, added a bunch of MORE_DEBUG output for finding odd bugs
like this.

Change-Id: Icdbe6a070af6cc7c708a938ad044108d40ebce9a
2014-07-17 19:12:09 -07:00
Christopher Tate
5f7f252b45 Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Don't just drop the error return on the floor and retry (forever!).

Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
2014-07-17 23:01:04 +00:00
Adam Powell
b7fae17a03 Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev 2014-07-17 21:58:28 +00:00
Yorke Lee
a19d7bfacf Rename voicemail permissions
Rename READ_ALL_VOICEMAIL to READ_VOICEMAIL, and MANAGE_VOICEMAIL
to WRITE_VOICEMAIL

Bug: 16400686
Change-Id: I4c87a7e2fb3aa71d7de3865301f110bcfb29221b
2014-07-18 17:11:50 -07:00
Adam Powell
e49d939378 Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
This allows the calling app to supply a set of alternative extras to
be sent along with the target intent if the user chooses specific
items from the full set available on the device. When replacement
extras have the same key as extras in the initial intent, the
replacement extras dominate.

Change-Id: I5d64c80447386f22402b71291bb289a74015d619
2014-07-18 16:27:11 -07:00
Shishir Agrawal
5552cc5c9d Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev 2014-07-17 21:58:28 +00:00
Christopher Tate
4a79daeaf7 Fix which index goes where
Change-Id: If4cf7efd4d7962eb5c10b487482653d86d92d2c6
2014-07-19 00:04:09 +00:00
Shishir Agrawal
86578cca38 Adding the ability for carrier app to override SPN and carrier name.
The change allows system apps (holding MODIFY_PHONE_STATE permission) or
carrier apps to override the "carrier branding" on a per ICCID basis. The
override affects the service provider name as well as the network operator
name. The override is also saved as a SharedPreference and will persist for
the iccId across reboots.

Change-Id: I985ba247e10e2501e3d0d21567ccadc46f365879
2014-07-17 16:31:37 -07:00
Youngsang Cho
6f306e21f4 Merge "TIF: Add unblock content" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
427f74293b Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 2014-07-18 18:24:25 +00:00
Jaewan Kim
903d6b72cd TIF: Add unblock content
When a TV content is blocked by the parental control settings,
TV input service will notify TV to request user's PIN code verification.

If the verification succeeds, TV input service will be notified back
that content is unblocked so it can keep playing the content.

Bug: 13172379
Change-Id: I7b31d762eb54612c4d8779ee133211f32fb73b05
2014-07-18 11:11:38 -07:00
Jaewan Kim
8e6b51b0fb TIF: Add onInputAdded and onInputRemoved
Bug: 16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
2014-07-18 15:35:25 +09:00
Sreeram Ramachandran
64126bc3c3 Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev 2014-07-17 21:58:28 +00:00
Sreeram Ramachandran
cc26b4cc09 Allow VPN interfaces to be put into blocking mode.
New API with stub implementation to be filled out later.

Bug: 12879610
Change-Id: Iff711994dec4598c74fe11447c8c670004c1188c
2014-07-18 16:46:13 -07:00
Winson Chung
57eea0f788 Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev 2014-07-17 21:58:28 +00:00
Jason Monk
56e09b42a0 Add setting to guard the lock-to-app recents icon
Lock-to-app (soon to be screen-pinning) will now only show up once
it has been enabled in settings.

Bug: 16378448
Change-Id: Ide333463f86310eacb7a1d8b6dc7b1aea8722713
2014-07-18 16:45:34 -07:00
Winson Chung
76053fa803 Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100) 2014-07-18 23:44:17 +00:00
Ihab Awad
3840f33e79 Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev 2014-07-18 18:24:25 +00:00
Ihab Awad
7522bbd652 Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
Change-Id: I91c0d6be76030117ed3cf6d6d5f7514b4d4802ad
2014-07-18 16:03:22 -07:00
Yin-Chia Yeh
8f8141e24f Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 2014-07-18 18:24:25 +00:00
Yin-Chia Yeh
12da140082 Camera2: add highSpeedVideoConfig wrapper and APIs
- Add wrapper class for highSpeedVideoConfiguration.
- Add APIs to query high speed video recording configurations in
  StreamConfigurationMap
- Fix ColorSpaceTransform unit test in CameraMetadataTest
- Fix a bug in HashCodeHelper

Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2
2014-07-18 16:00:53 -07:00
Dake Gu
7bf379c8af ActivityTransition: fix wrong width/height applied to sharedelement.
transform screen position/size to position/size in parent of sharedelement.
fixed bug of transformMatirxToLocal() and transformMatrixToGlobal() that gets

Change-Id: I4c7b12f1ada7004ab7594961df4079be4ca4c909
2014-07-18 22:49:57 +00:00
Amith Yamasani
6bce0f739b Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev 2014-07-17 21:09:48 +00:00
Prashant Malani
84b08adcbb Make the booting flag update unconditional
In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.

Bug: 16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
2014-07-18 23:10:08 +00:00
Amith Yamasani
570002ffd4 Add a hidden API to expose cross profile caller id check
To be used by telephony/contacts.

Change-Id: If8e06c20a708ce5e8f7d717d8758c19a78efa46d
2014-07-18 22:51:04 +00:00
Wonsik Kim
5b2295a521 Merge "TIF: change onCreateSession() method signature" into lmp-dev 2014-07-17 21:07:39 +00:00
Youngsang Cho
3b0f928475 Fix a build breakage
Updated current.txt.

Change-Id: Ib1434da2345aa349e5fc3112bf38dbba9955c885
2014-07-17 21:27:00 -07:00
Wonsik Kim
1032f034ff TIF: change onCreateSession() method signature
Bug: 16138420
Change-Id: I73f4992bd76b888c7e5bc6260b3ed849760ee707
2014-07-18 12:00:20 +09:00
Youngsang Cho
2b8aa9903a Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
abebf6df87 TIF: Change the parameter of TvInputInfo.loadLabel/Icon
Labels and icons will be extracted from URI in the future.
To acheive it, we need Context rather than PackageManager.

Bug: 16166859
Change-Id: I20f0506fba5876a6cf21b70e44bb3a2265f723d7
2014-07-17 17:49:29 -07:00
Niels Egberts
5e413470e5 Merge "Add money as a new TtsSpan type." into lmp-dev 2014-07-17 19:55:10 +00:00
Adam Lesinski
0debc9aff4 First iteration of a public UsageStats API
UsageStats API that allows apps to get a list of packages that have been
recently used, along with basic stats like how long they have been in
the foreground and the most recent time they were running.

Bug: 15165667

Change-Id: I2a2d1ff69bd0b5703ac3d9de1780df42ad90d439
2014-07-18 15:24:20 -07:00
John Reck
d3de42cae8 Add RT-enabled reveal animator
Bug: 16161431

 Also re-writes RevealAnimator to avoid using any listeners internally,
 removing the logic around shadowing the update listeners.

Change-Id: I6ed8126398eed971a87f20bccb7584c9acafbb6c
2014-07-18 22:10:22 +00:00
Zhijun He
fac77c46fe Camera2: send the partial result with onCaptureProgressed
When partial results are receieved, call onCaptureProgressed instead of
onCapturePartial.

Change-Id: If97233d7b980f490821bca0a722d527f19034cd9
2014-07-18 22:01:48 +00:00
Niels Egberts
b1a092c772 Add money as a new TtsSpan type.
Added ARG_QUANTITY to decimal so money and measure can 'inherit' it.

Change-Id: I0f9f464d198a9875df4a01e8a5c95a3d19ed6f7f
2014-07-18 18:46:20 +01:00
Sailesh Nepal
e7127ff031 Merge "Add Connection.startActivityFromInCall" into lmp-dev 2014-07-17 21:09:48 +00:00