OSDN Git Service
Nick Kralevich [Tue, 14 Oct 2014 15:38:05 +0000 (08:38 -0700)]
resolved conflicts for merge of
a4eb81b6 to lmp-dev
Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
Evan Charlton [Mon, 13 Oct 2014 22:19:39 +0000 (22:19 +0000)]
Merge "Update the SDK AIDL list" into lmp-dev
Evan Charlton [Sun, 12 Oct 2014 16:54:30 +0000 (09:54 -0700)]
Update the SDK AIDL list
Populate the framework.aidl list with .aidl files which are:
- In the android.* namespace
- Not marked @hide
- Do not have their corresponding .java files marked @hide
Bug:
17952409
Change-Id: I1f4abf7abbc298a51605571cd168362dcc5603b2
Sarah Maddox [Mon, 13 Oct 2014 21:50:28 +0000 (21:50 +0000)]
Merge "Fixed a typo in Perf Tips." into lmp-dev
Alan Viverette [Mon, 13 Oct 2014 21:31:39 +0000 (21:31 +0000)]
Merge "Increase contrast for money permission" into lmp-dev
Elliott Hughes [Mon, 13 Oct 2014 20:55:29 +0000 (20:55 +0000)]
Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev
Jeff Sharkey [Mon, 13 Oct 2014 20:31:02 +0000 (20:31 +0000)]
Merge "DocumentsUI: Add content description for nav." into lmp-dev
Jesse Hall [Mon, 13 Oct 2014 20:23:14 +0000 (20:23 +0000)]
Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
Alan Viverette [Mon, 13 Oct 2014 20:12:49 +0000 (13:12 -0700)]
Increase contrast for money permission
BUG:
17923303
Change-Id: Ic35a9d37690ec5c4375285ca9b162cbff62db656
Jeff Sharkey [Mon, 13 Oct 2014 19:53:13 +0000 (12:53 -0700)]
DocumentsUI: Add content description for nav.
Bug:
17922955
Change-Id: I44c0107d8dd03aab36da55deeb864e328b492124
Elliott Hughes [Mon, 13 Oct 2014 19:39:56 +0000 (12:39 -0700)]
Ensure that the SIM language doesn't override the user language on the encryption UI.
Bug:
17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17
Amit Mahajan [Mon, 13 Oct 2014 19:32:36 +0000 (19:32 +0000)]
Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev
Yohei Yukawa [Mon, 13 Oct 2014 18:42:48 +0000 (18:42 +0000)]
Merge "Update config when "Show input method" is changed" into lmp-dev
Mike Lockwood [Mon, 13 Oct 2014 18:38:22 +0000 (18:38 +0000)]
Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev
Amit Mahajan [Mon, 13 Oct 2014 18:21:46 +0000 (11:21 -0700)]
Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to
signatureOrSystem.
Bug:
17952946
Change-Id: I4a75da11cb092ca795d0eacf824890eb12c7446a
Jesse Hall [Mon, 13 Oct 2014 18:01:15 +0000 (11:01 -0700)]
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
If nativeUnlockCanvasAndPost() throws, Surface was maintaining a
reference to the native Surface, and assuming it was still locked.
That would cause future lockCanvas() calls to throw without even
trying to lock the native Surface, even though in some cases the
native lock was actually released before the exception was thrown.
Now Surface treats the native object as unlocked even if
nativeUnlockCanvasAndPost() throws, so it will attempt the native lock
on lockCanvas() rather than assuming it would fail.
This change also changes an IllegalStateException to
IllegalArgumentException in unlockCanvasAndPost(). That exception was
added in KitKat, and was never documented or added to the throws
declaration. This was essentially a silent public API change. Quite a
bit of code in the framework (and likely in applications) catches
IAE from this method, but didn't attempt to handle ISE. Although ISE
is more correct here, it's not worth breaking code (and it did -- in
this bug it changed a problem that should have been silently and
perfectly recovered from into a fatal exception in system_server.)
Bug:
17684556
Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e
Michael Wright [Mon, 13 Oct 2014 17:30:31 +0000 (17:30 +0000)]
Merge "Clean-up ColorFade's shaders and buffers." into lmp-dev
Geoff Mendal [Mon, 13 Oct 2014 17:22:35 +0000 (17:22 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 13 Oct 2014 17:05:28 +0000 (10:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0248efd41328adc6acd19fb84131fc4d7606b774
Auto-generated-cl: translation import
Mike Lockwood [Mon, 13 Oct 2014 17:00:08 +0000 (10:00 -0700)]
Change RECEIVE_BLUETOOTH_MAP permission to signature or system
Bug:
17954105
Change-Id: I8b16cab7193c97e5f54d6e4ef33ebf8cda0da197
Geoff Mendal [Mon, 13 Oct 2014 13:57:32 +0000 (06:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic3cbd08f31920de16f0d21c846cde2ded2b2e3ec
Auto-generated-cl: translation import
Marcin Kosiba [Mon, 13 Oct 2014 09:37:34 +0000 (09:37 +0000)]
Merge "Remove the default WebView text encoding resource entirely." into lmp-dev
Joe Fernandez [Mon, 13 Oct 2014 05:36:59 +0000 (05:36 +0000)]
Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev
Joe Fernandez [Wed, 8 Oct 2014 05:55:44 +0000 (22:55 -0700)]
docs: Migrate TV Design docs to main DAC-Design area
Change-Id: Ie9ba7e519ccdf46b58010d5ff11b4042134b7a57
Sarah Maddox [Mon, 13 Oct 2014 03:08:38 +0000 (14:08 +1100)]
Fixed a typo in Perf Tips.
Change-Id: I427bd60211d6fa3f2d1f262dc2b9b8e7729d4adc
Joe Fernandez [Mon, 6 Oct 2014 00:04:13 +0000 (17:04 -0700)]
docs: migrate Android TV games page to TV training section
Change-Id: Ic6be9deaac5ad2516dba288c0c3d059e3c7a6118
Joe Fernandez [Sun, 5 Oct 2014 19:44:04 +0000 (12:44 -0700)]
docs: migrate Android TV content discovery
Change-Id: I35fe1e7f4f60409a0f7c5cd5bfc8ccfede4d6c20
Joe Fernandez [Thu, 2 Oct 2014 17:13:16 +0000 (10:13 -0700)]
docs: migrate TV Playback app content
Change-Id: I851dac6423cba3b76c85e1ac5b6c03a98272d868
Joe Fernandez [Thu, 11 Sep 2014 16:52:07 +0000 (09:52 -0700)]
docs: Android TV App Dev Basic Training
Change-Id: Iede448652efba25c3d0b6c26d49ea6548008515e
Joe Fernandez [Fri, 10 Oct 2014 04:16:03 +0000 (21:16 -0700)]
docs: Move the L-Developer Preview samples page to the Developer Samples area
Change-Id: I307acca1dd3105768ed5c72995b1c7e67bea0612
Dianne Hackborn [Sat, 11 Oct 2014 00:17:45 +0000 (00:17 +0000)]
Merge "Fix issue #
17829949: Don't kill Bluetooth service..." into lmp-dev
Amit Mahajan [Sat, 11 Oct 2014 00:07:18 +0000 (00:07 +0000)]
Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev
Amit Mahajan [Fri, 10 Oct 2014 21:41:44 +0000 (14:41 -0700)]
Fix to show low LTE signal strength as -140 instead of 0.
Bug:
17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
Alan Viverette [Fri, 10 Oct 2014 23:41:16 +0000 (23:41 +0000)]
Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev
Dianne Hackborn [Fri, 10 Oct 2014 22:03:13 +0000 (15:03 -0700)]
Fix issue #
17829949: Don't kill Bluetooth service...
...even in extreme low memory condition
Bind to Bluetooth with BIND_IMPORTANT, so that it is allowed to
go to a higher oom adj level.
Fix some problems when this is done from a system or persistent
process, where this would go to a level that is *too* high. Instead,
introduce a new oom adj level for it that is right below persistent.
Change-Id: I002bcc4accc36c8579c4cda161be7d2fba21ba17
Selim Cinek [Fri, 10 Oct 2014 21:14:33 +0000 (21:14 +0000)]
Merge "Fixed missing translation for wallpaper cropper" into lmp-dev
Selim Cinek [Fri, 10 Oct 2014 20:55:36 +0000 (13:55 -0700)]
Fixed missing translation for wallpaper cropper
Also a fixed a small visibility issue.
Bug:
17927204
Change-Id: Ia9566fe8fe0c70f83edc295b0bf8317e94eb85fe
Eric Gilmore [Fri, 10 Oct 2014 20:49:54 +0000 (20:49 +0000)]
am
e77fe607: Docs: adding closing bracket to un-break javadoc tokens.
* commit '
e77fe607609e5a6ea59e11164e21744623cf07a5':
Docs: adding closing bracket to un-break javadoc tokens.
George Mount [Fri, 10 Oct 2014 20:48:09 +0000 (20:48 +0000)]
Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
George Mount [Fri, 10 Oct 2014 20:22:36 +0000 (13:22 -0700)]
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
Bug
17938614
Change-Id: Ia341fdd63ab57ec16a3de6349b7eb07fdc0a48ae
Alan Viverette [Fri, 10 Oct 2014 19:52:25 +0000 (12:52 -0700)]
Add Cutive Mono as serif monospace font for captioning
Sets up Courier and Courier New to point to Cutive Mono, since
Courier is a serif monospace font.
BUG:
17666124
Change-Id: I96bb2ff59020edd8210c253752f76f0eb5100e18
Jerome Dochez [Fri, 10 Oct 2014 19:21:48 +0000 (19:21 +0000)]
Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev
Selim Cinek [Fri, 10 Oct 2014 18:49:11 +0000 (18:49 +0000)]
Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev
Christopher Tate [Fri, 10 Oct 2014 17:49:16 +0000 (10:49 -0700)]
Tweak wallpaper restore rejection threshold
Raise the height ratio threshold slightly in order to start accepting
restores of height=1920 images onto height=2560 devices.
Bug
17882661
Change-Id: I63b47817fdf754cda9a052bddb62aee764522c6f
Marcin Kosiba [Fri, 10 Oct 2014 16:12:49 +0000 (17:12 +0100)]
Remove the default WebView text encoding resource entirely.
Having the default text encoding in config.xml makes it seem like
it's something that could be changed, but upon further inspection
we can't see any good reason for anyone to ever want to change it
from UTF-8.
BUG:
17634120
Change-Id: I10a09ab1d65590c29efb10222abfa08ca52b5c84
Yohei Yukawa [Fri, 10 Oct 2014 06:13:28 +0000 (15:13 +0900)]
Update config when "Show input method" is changed
This is a follow up CL for I2237ded850a0d4ab43ca441d0b7df1.
Seems that we still need to update config settings every
time when "Show input method" is changed.
BUG:
17666032
Change-Id: I480aeaa038bef9c3c20e8f0b36110e92a35809db
Jinsuk Kim [Fri, 10 Oct 2014 03:52:24 +0000 (03:52 +0000)]
Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev
Dianne Hackborn [Fri, 10 Oct 2014 01:27:12 +0000 (01:27 +0000)]
Merge "Improve some docs, fix some debugging." into lmp-dev
Dianne Hackborn [Fri, 10 Oct 2014 00:59:38 +0000 (17:59 -0700)]
Improve some docs, fix some debugging.
- Add docs to Binder, Messenger, ResultReceier to explain their
relation (or lack there-of) to process lifecycle.
- Clarify some aspects of process lifecycle for services.
- Fix help text of am command.
- Fix per-package dumping of battery stats to not include history.
- Fix per-package dumping of proc stats to only include aggregated
and current stats and fix some formatting.
- Fix per-process dumping of meminfo to have an option to interpret
the input as a package, so including all processes that are
running code of that package.
- Fix top-level per-package debug output to correctly include all
of these improvements and give them a little more time (10s) to
complete for timing out.
Change-Id: I2a04c0f862bd47b08329443d722345a13ad9b6e2
Selim Cinek [Fri, 10 Oct 2014 00:48:05 +0000 (17:48 -0700)]
Fixed a bug where the panel got into a wrong state
Bug:
17939708
Change-Id: Ieaa9dc2fc0c92ce52b02ac4ea452df47ee492ac3
Svetoslav [Fri, 10 Oct 2014 00:03:53 +0000 (00:03 +0000)]
Merge "Fix child view ordering for accessibility." into lmp-dev
Svetoslav [Thu, 9 Oct 2014 22:49:02 +0000 (15:49 -0700)]
Fix child view ordering for accessibility.
When reporting views to accessibility services we are ordering the
children in a parent based on their location on the screen. The
initial implementation worked pretty well in practive but violated
the transitivity property leading to rare crashes in apps. The current
implementation does not violate transitivity but does not produce
good ordering.
Given the lack of time and to minumize risk this change uses the
old strategy which works most of the time and if that fails we
fall back to the current strategy. Coming up with a correct strategy
that produces good results requires more time.
bug:
17887986
Change-Id: I1c233ecdf318befc315e793696ac48bd6c652ab6
Selim Cinek [Thu, 9 Oct 2014 23:05:03 +0000 (23:05 +0000)]
Merge "Fixed an issue where the notification could become transparent" into lmp-dev
Selim Cinek [Thu, 9 Oct 2014 22:54:40 +0000 (15:54 -0700)]
Fixed an issue where the notification could become transparent
Bug:
17668881
Change-Id: If8389084c7696bb8d3c0155f1262ec1fe7973c44
Michael Wright [Thu, 9 Oct 2014 00:46:09 +0000 (17:46 -0700)]
Clean-up ColorFade's shaders and buffers.
Bug:
17672241
Change-Id: I73328ee4d83c3a8700b7b19b661bcaec7ada877f
Christopher Tate [Thu, 9 Oct 2014 22:20:24 +0000 (15:20 -0700)]
Fix bug
17931760 - spurious timeout leads to mayhem
We know a priori that the PMBA metadata package's backup pass
doesn't need to be tracked for timeout, because it's run inline
rather than as an asynchronous separate-process operation.
Change-Id: Ifd21ab3a016917f5e557a38c1c88f8d8ac1337d2
Christoph Studer [Thu, 9 Oct 2014 20:56:44 +0000 (20:56 +0000)]
Merge "WallpaperCropper: Use white color for action bar" into lmp-dev
Christoph Studer [Thu, 9 Oct 2014 20:50:21 +0000 (13:50 -0700)]
WallpaperCropper: Use white color for action bar
Bug:
17343815
Change-Id: I5802f04204d081b97fbc2e2cb203fa03f16fea6a
Adam Lesinski [Thu, 9 Oct 2014 19:02:23 +0000 (19:02 +0000)]
Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev
Dianne Hackborn [Thu, 9 Oct 2014 19:00:11 +0000 (19:00 +0000)]
Merge "Implement issue #
17906468: Allow search request to fall back to global search" into lmp-dev
Jorim Jaggi [Thu, 9 Oct 2014 18:29:35 +0000 (18:29 +0000)]
Merge "Fix content description for bluetooth icon" into lmp-dev
Adam Lesinski [Thu, 9 Oct 2014 18:08:04 +0000 (11:08 -0700)]
Search all packages for a given type string when looking up resources by name
Previously we would stop at the first match when looking for a type string,
but we should search all packages in case a feature Split added a type
with the same name.
Bug:
17924027
Change-Id: I6bc7ef073324db99448538cd8bdf566658f066ff
Joe Fernandez [Thu, 9 Oct 2014 18:03:20 +0000 (18:03 +0000)]
Merge "Revert "Removed preview license."" into lmp-dev
Joe Fernandez [Thu, 9 Oct 2014 18:02:10 +0000 (18:02 +0000)]
Revert "Removed preview license."
New plan: We need this for the Device Preview images provided on the final L-Preview page.
This reverts commit
4974e7f27cf93842001c10379c0be0b24eb035d7.
Change-Id: I1b5fd6d58c53c6ac14f86c688eaea540d683134a
Sandeep Siddhartha [Thu, 9 Oct 2014 17:54:15 +0000 (17:54 +0000)]
Merge "Add tests for model management [SDK Only]" into lmp-dev
Jorim Jaggi [Thu, 9 Oct 2014 00:10:58 +0000 (17:10 -0700)]
Fix content description for bluetooth icon
Bug:
17921584
Change-Id: I908d31aaa15188baffee76933a3025bad6bc2631
Dianne Hackborn [Thu, 9 Oct 2014 00:43:48 +0000 (17:43 -0700)]
Implement issue #
17906468: Allow search request to fall back to global search
Change-Id: I04834b2a9f1ec4a68c6a3fed14da2f8dd93b3be7
Eric Gilmore [Tue, 7 Oct 2014 19:48:48 +0000 (12:48 -0700)]
Docs: adding closing bracket to un-break javadoc tokens.
Bug:
17186958
Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
Etan Cohen [Thu, 9 Oct 2014 00:10:33 +0000 (17:10 -0700)]
TD_SCDMA is more like GSM than CDMA - re-classifying.
Bug:
17788412
Change-Id: Icc6a692a1f038624dde772f8d8f197aab604c166
Robin Lee [Thu, 9 Oct 2014 12:55:16 +0000 (12:55 +0000)]
Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev
Joe Fernandez [Thu, 9 Oct 2014 12:07:07 +0000 (12:07 +0000)]
am
a63f81ec: am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
* commit '
a63f81ec897988befad7b286b50f73a42319fd5e':
docs: Android TV publishing requirements
Joe Fernandez [Thu, 9 Oct 2014 12:01:36 +0000 (12:01 +0000)]
am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
* commit '
e15773be4837baf15079d5d7e8f8c0c09cef952f':
docs: Android TV publishing requirements
Robin Lee [Mon, 6 Oct 2014 10:36:25 +0000 (11:36 +0100)]
DevicePolicy: One cert tracker warning per profile
Shows one notification per profile instead of one notification per
user or (previously) one notification per device.
Bug:
17794425
Change-Id: I6f0d34a16fa2a45082941387ac765dd99eefa131
Joe Fernandez [Thu, 9 Oct 2014 04:19:19 +0000 (04:19 +0000)]
Merge "docs: Android TV publishing requirements" into klp-modular-docs
Joe Fernandez [Mon, 6 Oct 2014 05:12:10 +0000 (22:12 -0700)]
docs: Android TV publishing requirements
Change-Id: If1105cb596934034a7156b573c99905bbe6c4978
Chong Zhang [Thu, 9 Oct 2014 00:05:16 +0000 (17:05 -0700)]
MediaHTTPConnection: do not use proxy for localhost
Bug:
17681512
Change-Id: Iba25d89636d8f96efc0eb90e0dd7a135c82ff16a
Christopher Tate [Thu, 9 Oct 2014 02:04:01 +0000 (02:04 +0000)]
Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev
Christopher Tate [Wed, 8 Oct 2014 21:51:09 +0000 (14:51 -0700)]
Also monitor MOVED_TO events for wallpaper updates
Restore uses moveTo(), not open/write/close, so we need
to watch for that as well. Now the wallpaper service sees
and regenerates the wallpaper image immediately upon restore.
Bug
17909454
Change-Id: I0db224c3d507bdc40399d49bb4bea01899f76ad1
Fred Fettinger [Thu, 9 Oct 2014 01:23:59 +0000 (01:23 +0000)]
am
b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
* commit '
b4093c12f8a8cf73f869419904c60e953f5725ee':
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
mike dooley [Wed, 8 Oct 2014 20:39:28 +0000 (13:39 -0700)]
Fix hangouts conference calling regression.
Check the connection-by-id hash table instead of conference-by-id hash
table when setting conferenceable connections.
Bug:
17919110
Change-Id: Ia8a5ab3fb96926e600d21eca7737a0044b233563
Fred Fettinger [Fri, 29 Aug 2014 19:02:31 +0000 (14:02 -0500)]
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
Cherry-picked into klp-modular-dev.
bug:
17441218
GLConsumer uses glBindTexture() directly instead of going through
Caches::bindTexture(). This can cause libhwui to draw with the wrong
texture bound in the following case which involves 2 TextureViews:
Frame 1:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
Frame 2:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 2)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
HWUI renders TextureView B:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 2) and draws
In this case, HWUI will incorrectly draw TextureView A using texture 2 on
frame 2, because mBoundTextures[0]=1, even though the texture currently
bound to GL_TEXTURE_EXTERNAL_OES is 2.
Since GLConsumer is always used with a target of GL_TEXTURE_EXTERNAL_OES,
work around this problem by having mBoundTextures[] store only the
textures bound to the target GL_TEXTURE_2D. This is the common case
where the extra performance is needed. Since it's legal to have
different textures bound to GL_TEXTURE_2D and GL_TEXTURE_EXTERNAL_OES
on one texture unit, Caches::bindTexture() does not need to clear
mBoundTextures[mTextureUnit] when target != GL_TEXTURE_2D.
Change-Id: I8bc54ab8adcfacad7f3ed17a31236dc7a86c967a
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
(cherry picked from commit
e4de36bbc2baf13206deb53ced39f0befadb1861)
Tim Kilbourn [Thu, 9 Oct 2014 00:49:34 +0000 (00:49 +0000)]
Merge "Don't start SearchDialog on television." into lmp-dev
Jeff Brown [Thu, 9 Oct 2014 00:14:39 +0000 (00:14 +0000)]
Merge "Ensure we correctly unblank displays when added." into lmp-dev
smain@google.com [Thu, 9 Oct 2014 00:10:06 +0000 (00:10 +0000)]
am
63cd4977: am
770c3c5e: fix unclickable link due to overlay from offset dev below
* commit '
63cd4977fd72de401f347ba159a71fe3d04399b3':
fix unclickable link due to overlay from offset dev below
smain@google.com [Thu, 9 Oct 2014 00:04:57 +0000 (00:04 +0000)]
am
770c3c5e: fix unclickable link due to overlay from offset dev below
* commit '
770c3c5ed52f354fe04ced31aaa56ba57a028955':
fix unclickable link due to overlay from offset dev below
Tim Kilbourn [Thu, 9 Oct 2014 00:01:42 +0000 (17:01 -0700)]
Don't start SearchDialog on television.
Bug:
17654744
Change-Id: Ie76405d648b7ac34a70465e275315f9cf277a3fe
smain@google.com [Wed, 8 Oct 2014 23:58:33 +0000 (23:58 +0000)]
Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev
smain@google.com [Wed, 8 Oct 2014 23:54:21 +0000 (16:54 -0700)]
fix unclickable link due to overlay from offset dev below
Change-Id: I59bedd0e928d578a3bd030caa4add4cfa96db83f
Christopher Tate [Wed, 8 Oct 2014 23:31:30 +0000 (23:31 +0000)]
Merge "Actually tell the widget service that restore is starting" into lmp-dev
smain@google.com [Wed, 8 Oct 2014 23:23:34 +0000 (16:23 -0700)]
update droiddoc option to include api level 21 for javadoc tagging
Change-Id: Ifdb09267b0cdab4cd89aaea455de6270481ff230
RoboErik [Wed, 8 Oct 2014 22:30:04 +0000 (22:30 +0000)]
Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev
Christopher Tate [Wed, 8 Oct 2014 21:44:35 +0000 (21:44 +0000)]
Merge "Turn on dimension validation in wallpaper restore" into lmp-dev
Georgi Nikolov [Wed, 8 Oct 2014 20:50:45 +0000 (20:50 +0000)]
Merge "BUG
17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev
Ye Wen [Wed, 8 Oct 2014 20:47:05 +0000 (20:47 +0000)]
Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev
Adam Lesinski [Wed, 8 Oct 2014 20:34:54 +0000 (20:34 +0000)]
Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-dev
Ye Wen [Tue, 7 Oct 2014 22:33:51 +0000 (15:33 -0700)]
Make MmsServiceBroker more robust to MmsService crashes
Retry connecting to MmsService when disconnected or upon each API call
if disconnected.
b/
17862188
Change-Id: Iecfb0a6ffb59b94f6c1121bf00ba2db438ed7001
Geoff Mendal [Wed, 8 Oct 2014 19:53:11 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Adam Lesinski [Wed, 8 Oct 2014 19:33:16 +0000 (12:33 -0700)]
Remove UsageEvents#resetToStart() as it doesn't work
After completely iterating over a UsageEvents object, the internal parcel
is recycled. If resetToStart is called then, it does nothing.
Bug:
17909428
Change-Id: I7bc68d3429e4621a50dedbfc1789576d44dbb3be
Christopher Tate [Wed, 8 Oct 2014 19:19:48 +0000 (12:19 -0700)]
Turn on dimension validation in wallpaper restore
Bug
17906491
Change-Id: I4c76c3197df95b51a6e44d1fe2d522b6c05284e5
Quddus Chong [Wed, 8 Oct 2014 19:08:31 +0000 (19:08 +0000)]
am
9df3d67b: am
7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
* commit '
9df3d67bdc7c1fa79d0daab1f2ae5f69a476f8dd':
docs: Changed date of GMS v6.1 (Manchego) release to October 2014.