146968 Commits

Author SHA1 Message Date
Jae Seo
dfab517fb2 Merge "TIF: Make selected tracks identifiable" into lmp-dev 2014-08-04 23:42:57 +00:00
Brian Carlstrom
eaeae259fa Switch from core to core-libart
Bug: 14298175

(cherry picked from commit dbcae5ceb766b0bc65fa819841f9bfab9ae11c2f)

Change-Id: I982d02184b7bfdd14f447e2761fe5d058c53489b
2014-08-05 15:01:01 -07:00
Hui Shu
eb8ac25fe5 DO NOT MERGE: Revert "Update makefile for clang host build."
This CL is somehow merged to lmp-dev and breaking Mac builds.

This reverts commit 132ed0f2b45acf982bbd06616f14164b612661d1.

Change-Id: I5a3472c0e2924db5c605340d7abdd407b956dcc2
2014-08-05 21:38:03 +00:00
Jae Seo
10d285ac06 TIF: Make selected tracks identifiable
A recent change on the multi-track API surfaced an issue that it's hard to
identify selected tracks from the list of tracks obtained from
TvView.getTracks() method, especially when two or more tracks convey the same
track information (e.g. two English stereo audio tracks with the same sample
rate). This change introduced a new public method getId() in TvTrackInfo that
returns an ID with which one can identify the tracks uniquely. It also led to
minor signature changes across the multi-track API to make it more
developer-friendly in both application and TV input service developers'
perspectives.

Change-Id: I226f75e697b0ce52b44db7471660f6d9f646f6f9
2014-08-05 12:06:49 -07:00
Jorim Jaggi
781c29c9a8 Show bouncer if secure camera would show chooser.
Bug: 16570873
Change-Id: I2a86fb3a823d5255c0c35a78c1832c273e3a1578
2014-08-05 18:47:54 +00:00
Jeff Sharkey
ab1e9bddd8 Scan after writing external storage files.
Kicks off media scanner after files are written.

Bug: 13557203
Change-Id: I61613f28e07b068573079cc1e362fd3fe135684e
2014-08-05 18:34:37 +00:00
Chris Craik
e4cf152cb7 Move clip bound execution into drawChild()
bug:15698973

This makes native and java implementations match up in the sequence of
clip vs applying other properties / draw calls.

Change-Id: Ia75e00c5b42f81ecd516722ef1c5233d483e0c97
2014-08-05 18:01:53 +00:00
Jeff Sharkey
f174c6e6de Stronger constraints around install session IDs.
Generate positive, non-zero session IDs, and don't recycle them
within a given boot.  Guard against ID starvation by crazy apps.

Bug: 16792837
Change-Id: I6035afe4d942d358b5ca12b4f818c55885b74aba
2014-08-05 17:46:05 +00:00
Deepanshu Gupta
cf49a24e2f Merge "Get filename from File faster" into lmp-dev 2014-08-05 00:34:22 +00:00
Deepanshu Gupta
70d1574db9 Get filename from File faster
Use the direct call from a File object to get the filename instead of
going through Path which depends on Java 7 making the LayoutLib tests
incompatible with Java 6.

Change-Id: I815895eedbc10245ee09bdb53b11e5548b076aad
2014-08-05 14:34:56 -07:00
RoboErik
75847b98f3 Add display metadata and change strings to CharSequences
This adds some fields for display purposes to MediaMetadata and also
makes the default for all text CharSequence instead of String. Also
adds a hidden method for getting a Description for the metadata.

bug: 11708293
Change-Id: I0ed58d9ac3aeff41325c4ccf5fed0539bbf03b4d
2014-08-05 14:30:27 -07:00
Deepanshu Gupta
b0d767dcf1 Skip loading otf fonts on Java 6
Change-Id: I9668b84812e9be333d10603657dd911024fc292d
2014-08-05 14:19:27 -07:00
Deepanshu Gupta
0c5cd96522 Add SystemProperties native method implementations.
Bug: http://b.android.com/73046
Change-Id: Ia695e7beb81f426509b646cfd929201f7e0a4ade
2014-08-05 21:13:00 +00:00
Deepanshu Gupta
45aab0eb8f LayoutLib: Use ICU's line break algo.
Change-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07
2014-08-05 21:12:16 +00:00
Michael Wright
01e840ff94 Add resize method for virtual displays
Change-Id: I2632fc56c2d2cba356379e42f5c1a3e283b11d1e
2014-08-05 21:10:03 +00:00
Jason Monk
966e258396 Merge "Disable heads up when DISABLE_NOTIFICATION_ALERT" into lmp-dev 2014-08-05 00:15:52 +00:00
Jorim Jaggi
9cf1f37737 Update keyguard icon paddings to spec.
Bug: 15381387
Change-Id: Ia75394fd68f66233ebabe9ec4f62b42d40d19eb9
2014-08-05 17:18:55 +00:00
Jason Monk
f701954d4e Disable heads up when DISABLE_NOTIFICATION_ALERT
When notification alerts are disabled also turn off heads up. This
will fall back to the old behavior, which can allow the fullscreen
intent to be triggered instead.

Bug: 14157742
Change-Id: I4b6e3d9383894b1674d600c374ff8968ca53513e
2014-08-05 17:16:56 +00:00
Jeff Sharkey
f75eb0dd60 DocumentsUI is only dialog when really large.
Bug: 16780860
Change-Id: Ib20ef9771855beba5b31d19887c1c9c1b8e8e5ed
2014-08-05 17:16:44 +00:00
Jorim Jaggi
96caa68279 Merge "Revert "Clean up hiden notifications on Keyguard handling"" into lmp-dev 2014-08-05 00:19:02 +00:00
Jorim Jaggi
f641174eb9 Revert "Clean up hiden notifications on Keyguard handling"
This reverts commit d9267cae958b572b715d22a4905b18749a369c9f.

Too much performance regression - need to figure out something else.

Change-Id: I2d399add74402e1c036235ec095a053a6d5b828e
2014-08-05 17:10:43 +00:00
Jorim Jaggi
62a7c831d5 Clean up hiden notifications on Keyguard handling
Change-Id: Ifeabfdd1ed8c11b0796cc79bba81752518921be3
2014-08-05 17:00:22 +00:00
Justin Koh
106c16fbd9 Merge "Allow listeners to see children" into lmp-dev 2014-08-05 00:34:22 +00:00
Justin Koh
8d11a5aa2d Allow listeners to see children
Allow listeners to see notification children. Since L is not baked yet, keeping
this version check makes it difficult to test apps.

Bug: 16733244
Change-Id: I70afd6b99fc18c1f0b9188279c04fab80c37d414
2014-08-04 18:31:26 -07:00
Shriram Ganesh
61aac3aa0a IMS Framework & AIDL Changes for Call Barring & String Error Codes.
Change-Id: I66fdbbd175c13261c283627999f37071259f7a6a
2014-08-05 00:48:40 +00:00
Jean-Michel Trivi
fe3e10deaf Merge "AudioAttributes: implement hashcode and equals methods" into lmp-dev 2014-08-05 00:39:51 +00:00
Nicolas Prevot
fda7e2ae83 Merge "Security fixes related to cross-user content." into lmp-dev 2014-08-05 00:15:52 +00:00
Svet Ganov
194db6ad91 Fix cross-user permission checks in print manager service.
The cross-user check was requesting both interact across users and
interact across users all permissions which is too restrictive. Each
one is sufficient. Further, if the app has one of these premissions
but specifies a given user not current or current-self, the code
was throwing while the correct actions is to return the requested
user id as we alreay vetted the caller's permissions.

bug:16398152

Change-Id: I1a4863eb7b05dababb66bac6e143b78dfad42b81
2014-08-05 17:06:07 +00:00
Nicolas Prevot
504d78ea10 Security fixes related to cross-user content.
Enforcing that only uri grants work across users (not permissions).
Fixing a security hole where malicious Apps could access a uri if they had uri grants to the same uri on another user.
Enforcing that userIds in uris, if they exist, are the one of the ContentProvider.

BUG: 16779492

Change-Id: Iaa5264bd6c3aa0e15be3a4a64f9dc88238e0cb2e
2014-08-05 17:05:09 +00:00
Andre Eisenbach
57210c7a1a Add transport parameter to createBond() function (4/4)
Bug: 14063256
Change-Id: I096248b60752992aa23ce5bfbfc47fda95773db2
2014-08-05 17:01:13 +00:00
Torne (Richard Coles)
c19f854965 Merge "Log the version of the WebView package used." into lmp-dev 2014-08-05 00:15:52 +00:00
Svet Ganov
c946f14a67 Properly update accessibility manager state.
Applciations that fire accessibility events have to first check
it accessibility is on and then fire the event. If the app fires
an event when the feature is off an exception is thrown. However,
due to the way accessibility state is pushed to the local
accessibility manager it was possible that the app checks that
aaccessibility is off, fires an event, then the state of the
local manager changes by the time the event is propagated up
the view tree and an exception is thrown. This is a regression.

We really want this exception to prevent apps sending events
across processes if accessibility is off, so now the state
we get from the system manager service is applied via a
message so if the app checks that accessibility is off, then
it will remain off (locally) until the event is propagated.

bug:16672964

Change-Id: Icf5d1b1bdff87b58f285f0d9e1a098552513bbe8
2014-08-05 16:02:21 +00:00
Torne (Richard Coles)
0606cd572a Log the version of the WebView package used.
To aid in debugging app behaviour when WebView updates may be present,
log the package name, version name, and version code of the WebView
package when we are about to load it into an application. Do this before
we actually load any part of the package in case of an issue loading it
in the first place.

Change-Id: Id653bad431760b7ead8e3f8eb29f9d6a8bb68d07
2014-08-05 16:12:09 +01:00
Yuncheol Heo
6aae6528a6 Refactor <Feature Abort> logic to concentrate it in one place.
- Don't reply from the unregistered address.
- Use "unrecognized opcode" as the default reason.

Bug: 16799466, Bug: 16798785
Change-Id: I7c2ece6436f7ebd59986d2baf4f45cd86e6622d9
2014-08-05 18:17:45 +09:00
Hector Dearman
ae9251262a Merge "Fix CookieSyncManager package summary" into lmp-dev 2014-08-05 00:35:13 +00:00
Hector Dearman
24f7e61a38 Fix CookieSyncManager package summary
Putting the deprecated at the beginning of a class comment seems
to cause problems with JavaDoc so I've moved it to the end.

Bug: 16799480
Change-Id: Ia23dab2ad8ceb8e107e047480b5cb324d11a1457
2014-08-05 10:55:30 +01:00
Sungsoo Lim
f128dbf076 Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev 2014-08-05 00:03:09 +00:00
Sungsoo Lim
e6dca2cfa4 TIF: A preliminary CL to add multiple rating systems
TODO: Add rating systems for the countries defined in this CL.

Change-Id: I128284fd8779723b5ffb5968e2a11ce4b4eae6b5
2014-08-05 17:35:38 +09:00
Jungshik Jang
3611051054 Merge "Refine recode apis." into lmp-dev 2014-08-05 00:03:09 +00:00
Jungshik Jang
faa49bc896 Fix bugs on timer recording action.
1. Apply masking to feature abort of SetXXXTimer
2. Announce error when failed to send SetXXXTimer.
3. Remove TimerRecordingAction when deivce is disabled.
4. Report clear timer record error thru onClearTimerRecordingResult.

Change-Id: Id243aa25481dad57509b4229ca214fa9b6b00fdc
2014-08-05 17:24:39 +09:00
Jungshik Jang
2afd97698d Refine recode apis.
1. add return type, int, to toByteArray method so
that caller can know how many of bytes it consumes.

2. put final keyword

Change-Id: Ia942016fa35ecb04b49be51170739101644c3e31
2014-08-05 14:46:05 +09:00
Jungshik Jang
363c4efa51 Merge "Fix invalid annotation, @throw" into lmp-dev 2014-08-05 00:07:36 +00:00
Jungshik Jang
f406cc3442 Fix invalid annotation, @throw
Change-Id: Id22635414567a8b525032df792f2309102d7ae62
2014-08-05 14:27:17 +09:00
Wonsik Kim
ee3166e0d5 Merge "TIF: implement setVolume for hardware inputs" into lmp-dev 2014-08-05 00:07:36 +00:00
Jinsuk Kim
6ffb03816f Plumbing for HdmiTvClient and HdmiControlService
Added a few more methods in HdmiTvClient to use the API provided
by HdmiControlService

Change-Id: Ib506699b9661b99cefc837b96ac64347a4e9420c
2014-08-05 13:05:49 +09:00
Yuncheol Heo
fc44e4e03c Let STB oneTouchPlay on SCREEN_ON event.
- Eleborate the reason code to initiate the initialization.

Bug: 16668375
Change-Id: I4ce657a9438e4f7baa7df2eaa102eb1ce1a7bccb
2014-08-05 11:15:59 +09:00
Wonsik Kim
8e45a33ca8 TIF: implement setVolume for hardware inputs
Bug: 16635576
Change-Id: Ibba9f32b22451d9792b5e74c2cf36cab356e4ab1
2014-08-05 10:33:08 +09:00
Jinsuk Kim
e877138d44 Merge "CEC: Make port info unmodifiable" into lmp-dev 2014-08-04 23:56:40 +00:00
Jinsuk Kim
30c74d9ba6 CEC: Make port info unmodifiable
Puts HDMI port information behind unmodifiable type. This helps API make use
of port-related information without having to switch to service thread.
See getActiveSource().

Added the unmodifiable version of SparseArray/SparseIntArray.

Change-Id: Idcf05d1d6e19b47c91a7e89a920abccc607a3eb5
2014-08-05 21:05:16 +00:00
Jinsuk Kim
58500f43ec CEC: Make deviceSelect to active device a no-op
Changing input to already the active source should return
immediately without initiating routing control. This is also required
for processing the incoming <Active Source>

Also set the flag in intent for input change to start a new
activity from a service. The service fails to launch an activity
without it.

Bug: 15570939
Change-Id: I9b20b31137dfa4dc847bc43cc7fd35e669d0dec7
2014-08-05 21:04:44 +00:00