Alex Klyubin
363cbe5f7d
am 132617de: am 7b55b8f0: am c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
...
* commit '132617de897a1de256114c1a6cc3680983d37e84':
Make MediaPlayer fail fast on UnknownServiceException.
2015-04-20 18:56:22 +00:00
Alex Klyubin
132617de89
am 7b55b8f0: am c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
...
* commit '7b55b8f0563d540804b14c1643b0adfea19a71b1':
Make MediaPlayer fail fast on UnknownServiceException.
2015-04-20 18:45:05 +00:00
Alex Klyubin
7b55b8f056
am c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
...
* commit 'c77c14c23d5617b7e4d69dccff890f3b1b55b567':
Make MediaPlayer fail fast on UnknownServiceException.
2015-04-20 18:34:05 +00:00
Stuart Scott
9a9a1d923d
Fixing build break
...
Change-Id: I7ab3673627d1fda2d96a17c7e1823417fcb5cfef
2015-04-20 11:33:06 -07:00
Alex Klyubin
c77c14c23d
Merge "Make MediaPlayer fail fast on UnknownServiceException."
2015-04-20 17:54:16 +00:00
Stuart Scott
f1fb39763d
Move factoryReset to service and protect.
...
bug:16161518
Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf
2015-04-20 10:52:35 -07:00
Junda Liu
f3c7bf432d
Add multi-sim support for getCarrierPackageNamesForIntent.
...
resbmit of change Id100b7c4606287a1daa90092cd3c8a5a6519247d
Bug: 20268073
Change-Id: I852aac4da492e15f1dd7a3c88693fa14ec07b7c4
2015-04-20 10:30:35 -07:00
Alex Klyubin
6db04b369e
Make MediaPlayer fail fast on UnknownServiceException.
...
This makes MediaPlayer's network streaming code fail fast when an
UnknownServiceException is encountered. This currently occurs when the
application declares that it does not perform cleartext network
traffic and tries to load media over cleartext HTTP. Without this CL,
MediaPlayer blocks for 30 seconds because it treats this error as
recoverable and goes into a ten retry loop with a three second delay
before each retry.
The result at MediaPlayer client level is
MediaPlayer.MEDIA_ERROR_UNKNOWN error. This error code is used for
non-recoverable situations such as when an invalid redirect is
encountered or the destination is unreachable.
Bug: 20026006
Change-Id: I10f0dadb7740902f8c7c73d0df96cfff31f08ada
2015-04-20 10:11:57 -07:00
Andrei Stingaceanu
19f1faa376
Merge "Text processing - stop showing an empty toast."
2015-04-20 16:57:44 +00:00
Tyler Gunn
df2cbc8989
API Cleanup - rename IConferenceable to Conferenceable.
...
Bug: 20165255
Change-Id: If4cb323749b6ef9e8657506434d760d07c34167f
2015-04-20 09:13:01 -07:00
Gustav Sennton
0d703f74d0
Merge "Fix loading of null webview if there is no webview package."
2015-04-20 15:23:27 +00:00
Thiemo Nagel
116387c632
Remove unsed failedAttemptWarning in reportFailedUnlockAttempt().
...
Change-Id: I6ca76f6ebe84e04f84161c7fc06d1e2443f7bbfe
2015-04-20 16:50:38 +02:00
Geoff Mendal
9af41eb721
Merge "Import translations. DO NOT MERGE"
2015-04-20 14:32:16 +00:00
Geoff Mendal
9378542e51
Import translations. DO NOT MERGE
...
Change-Id: I9b999b01c25a4e4faea1abb76410a0aaf47d65cd
Auto-generated-cl: translation import
2015-04-20 07:31:00 -07:00
Andrei Stingaceanu
6154b0909c
Text processing - stop showing an empty toast.
...
If the text processing app returns empty or null text don't show the toast.
Bug: 20326103
Change-Id: Ib8534b851d2046fe7c17f674f170f9630e4a364d
2015-04-20 15:03:55 +01:00
Gustav Sennton
a8366e78b5
Fix loading of null webview if there is no webview package.
...
In the change in go/ag/672863 we throw an AndroidRuntimeException
instead of a PackageManager.NameNotFoundException when no webview
package exists. This should break devices not using webview since
the NameNotFoundException is used to detect webview not being present
(so that the null webview can be loaded instead). In this patch we
create a new type of exception and look for that one instead when we
want to determine whether the device should or should not have webview
installed.
Change-Id: Ia75dec718d7a5b2c3517671c54be3950badb8bba
2015-04-20 14:56:23 +01:00
Geoff Mendal
ca02bc7ceb
Merge "Import translations. DO NOT MERGE"
2015-04-20 13:08:03 +00:00
Geoff Mendal
e13825328e
Import translations. DO NOT MERGE
...
Change-Id: Ib763e6d6dc2f6eca3cd26ceb314b97ac90032719
Auto-generated-cl: translation import
2015-04-20 06:00:16 -07:00
Geoff Mendal
3ac2032586
Import translations. DO NOT MERGE
...
Change-Id: If0652f6630dbfb0110c8b13a479cb59c1af22bcc
Auto-generated-cl: translation import
2015-04-20 05:21:16 -07:00
Daichi Hirono
cf0e9ace5e
DocumentsUI: Save source file list into BaseActivity.State.
...
This is needed so that the activity does not lost the list on screen rotation.
BUG=20283251
Change-Id: I8f971bab0a0ce2066fd5fea29b98b355cb948ea6
2015-04-20 20:01:49 +09:00
Sander Alewijnse
e94787a027
Merge "Add certificate checksum extras."
2015-04-20 10:31:28 +00:00
Erik Kline
f851d6dd2a
CONNECTIVITY_ACTION is the new _IMMEDIATE
...
Bug: 20013379
Change-Id: I3e904dc0a0ddb30c7bb8cdb24d0762052ddc59eb
2015-04-20 16:11:58 +09:00
Keisuke Kuroyanagi
65769551df
Merge "Enable mouse drag text selection for unfocused TextView."
2015-04-20 04:49:50 +00:00
Dongwon Kang
2f732bf9f0
TIF: Document the default sort order for the tables in TvContract.
...
Bug: 19357901
Change-Id: If9f1053c5f74cb6781433d3fe8d09b10a19ca513
2015-04-20 08:06:15 +09:00
Jeff Sharkey
341cba2ae6
Merge "Wait for first scan before partitioning is done."
2015-04-19 21:37:48 +00:00
Jeff Sharkey
eba260d6d3
Wait for first scan before partitioning is done.
...
This means newly created volumes are at least created for other
platform components to start poking with.
Bug: 19993667
Change-Id: I561a5d0e3659ff9146832aeb6a31ab78fd9da580
2015-04-19 14:35:16 -07:00
Svet Ganov
5a71f4fbaf
Merge "Add OP_ADD_VOICEMAIL app op - framework"
2015-04-19 20:05:08 +00:00
Svet Ganov
c3300090f5
Add OP_ADD_VOICEMAIL app op - framework
...
Change-Id: Id21063b93958c9e372dcbaac8ff9f4fa8b5f0cb3
2015-04-19 13:00:32 -07:00
Abodunrinwa Toki
b90443724a
Fix FloatingToolbar animation interruptions.
...
This CL makes sure animations don't conflict with one another.
Cancelling an animation should also set the animating object to
the end state.
Change-Id: Ib74515bb99090ce11a6ccd840aba0baee9fc1bf5
2015-04-19 18:55:42 +01:00
Abodunrinwa Toki
7270d07aab
Implement FloatingToolbar.hide()
...
Bug: 20148125
Change-Id: I62e43df565801ada8230fc4a8d5d3f9e1fc842df
2015-04-19 15:43:56 +01:00
Jeff Sharkey
d709e4118a
Merge "Broadcast hidden volumes, notification polish."
2015-04-19 06:17:00 +00:00
Jeff Sharkey
e6c04f9417
Broadcast hidden volumes, notification polish.
...
Send limited broadcast intent when certain volume state changes
occur; the only customer for now is ExternalStorageProvider.
Change notification flow to be less bumpy. Pick USB icon based on
disk type, and avoid using "generic" disk labels.
Bug: 19993667
Change-Id: I263bc9e9aae2ae57eb4d1afe76da686aee5475fb
2015-04-18 23:11:00 -07:00
Ryosuke Matsuuchi
2314b47b11
am b84f4cfe: am fea08ccd: am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit 'b84f4cfe5d09ea55900bd8ea3b68970a998a244f':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 05:50:47 +00:00
Svet Ganov
21301f6016
Add OP_READ_PHONE_STATE app op continued - framework
...
Change-Id: If1c2783ad9ea2aa773e5416e09a3cfd1817ef73f
2015-04-18 22:49:28 -07:00
Jeff Sharkey
7227436671
Merge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent.""
2015-04-19 05:00:29 +00:00
Jeff Sharkey
1b7ed7b1c2
Revert "Add multi-sim support for getCarrierPackageNamesForIntent."
...
This reverts commit 0ff9fd87d0a0d88bf46945629d0a30f6e7fb3f55.
Change-Id: I099c612ff1715c5c34c0ed9bc1bec460a1a5db01
2015-04-19 04:59:56 +00:00
Jeff Sharkey
4cfb3130a4
Merge "Enable the copy feature."
2015-04-19 04:35:39 +00:00
Junda Liu
f47c6488ea
Merge "Add multi-sim support for getCarrierPackageNamesForIntent."
2015-04-19 04:30:15 +00:00
Jeff Sharkey
5f6f559a62
Merge "Always send volume UUID with installd commands."
2015-04-19 04:19:16 +00:00
Jeff Sharkey
529f91fc8e
Always send volume UUID with installd commands.
...
Since packages can be moved to other volumes, all relevant commands
to installd now require an explicit volume UUID parameter.
Bug: 20275577
Change-Id: Ie84f5bc43c7aada5800b8d71692c7928b42b965e
2015-04-18 21:11:58 -07:00
Ryosuke Matsuuchi
b84f4cfe5d
am fea08ccd: am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit 'fea08ccdffdf3d56276f84cf5b01165e6b2bb85f':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 01:30:42 +00:00
Ryosuke Matsuuchi
fea08ccdff
am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit '3d1a37e9ecffd89f61de27d924b0469a6a09ea8c':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:55:05 +00:00
Ryosuke Matsuuchi
3d1a37e9ec
am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit '38d969c5c85f930cefef6f2fcad99d5aa8a0d5f7':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:44:42 +00:00
Ryosuke Matsuuchi
38d969c5c8
am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit '558907f702ab21d4166d5d7f7986cb18c4a993bd':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:32:53 +00:00
Ryosuke Matsuuchi
558907f702
am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit '0d2f280310458d23618edf6550818f8f9cfa6b47':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:22:51 +00:00
Dirk Dougherty
2142bedd72
am 93e73639: am 308cd160: am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
...
* commit '93e73639bf0e1cea63c0c0eee24f4be2aba5fb0f':
Doc change: distribute landing page.
2015-04-19 00:17:09 +00:00
Ryosuke Matsuuchi
0d2f280310
Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
2015-04-19 00:15:12 +00:00
Dirk Dougherty
93e73639bf
am 308cd160: am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
...
* commit '308cd16022c43b64e5621dbf6938c8ee5ad22aa9':
Doc change: distribute landing page.
2015-04-19 00:05:38 +00:00
Dirk Dougherty
308cd16022
am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
...
* commit '488e5bbc2333adb1c84be90b797e1a8d36d070c3':
Doc change: distribute landing page.
2015-04-18 23:54:58 +00:00
Dirk Dougherty
488e5bbc23
am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
...
* commit '1696552f127c82aed9036eb1fa6b44c826d57eec':
Doc change: distribute landing page.
2015-04-18 23:43:54 +00:00