Commit Graph

309172 Commits

Author SHA1 Message Date
TreeHugger Robot
4f2a40ac9f Merge "Revert "Workaround libmemunreachable lockup"" 2017-01-24 19:49:55 +00:00
Fyodor Kupolov
02616eaac8 Whitelist CHANGE_DEVICE_IDLE_TEMP_WHITELIST for systemui
Test: device starts without warning
Change-Id: Ia13f7cee3da7eb2ac185415b44b6905f0f28c487
2017-01-24 11:39:23 -08:00
TreeHugger Robot
25ee47ff24 Merge "Temporarily disable LauncherApps reverse access check" 2017-01-24 19:35:22 +00:00
Sanket Agarwal
1f3a5adafd Merge "Change HFP Client API to support multi device" am: 01f2e67648 am: aaa490025b am: ccf418fc4d
am: 2ba1fda3fe

Change-Id: Ia653aabb543d4689de0198cf69d95ba553607d84
2017-01-24 19:33:19 +00:00
Clara Bayarri
b0812a3049 Introduce Fonts Content Provider
This change exposes to developers the ability to request fonts
from a provider via Typeface.

Until further security is implemented, only system apps can
provide fonts.

Test: See topic for CTS change
Change-Id: Ic7d5e2648340ee561f4d4c2d73a673748d2af076
2017-01-24 19:32:09 +00:00
Fyodor Kupolov
c911bf6481 Merge "[DO NOT MERGE] Do not log boot times for secondary users and upgrades" into nyc-mr2-dev am: fcb06b3735
am: 34cf649e90  -s ours

Change-Id: I401b6356be18871631b2adc04b4c55a9437a965d
2017-01-24 19:32:04 +00:00
Fyodor Kupolov
e34721f5f4 [DO NOT MERGE] Do not log boot times for secondary users and upgrades am: 1cd8508ba8
am: 7ed9a12e33  -s ours

Change-Id: I4c4026b515fc86c2b2306d756fd87a6dec399026
2017-01-24 19:30:58 +00:00
TreeHugger Robot
2697703abb Merge "Disabling crash dialogs on TV" 2017-01-24 19:20:09 +00:00
TreeHugger Robot
08bbfa9498 Merge "TIF: Add new TvContract fields for guide view on launcher" 2017-01-24 19:19:18 +00:00
TreeHugger Robot
59138c0004 Merge "Add intent to browse recording schedules" 2017-01-24 19:15:30 +00:00
Sanket Agarwal
2ba1fda3fe Merge "Change HFP Client API to support multi device" am: 01f2e67648 am: aaa490025b
am: ccf418fc4d

Change-Id: Iad5f61ad2a5e2f7ab8d8c74567eea5c519ba87ca
2017-01-24 19:15:17 +00:00
Sanket Agarwal
ccf418fc4d Merge "Change HFP Client API to support multi device" am: 01f2e67648
am: aaa490025b

Change-Id: I2e5a77ba5efece7af1d4be91ca795cd97e96acf3
2017-01-24 19:11:21 +00:00
Sanket Agarwal
aaa490025b Merge "Change HFP Client API to support multi device"
am: 01f2e67648

Change-Id: I887b83939581fe1fd4068f7a4a72a6910c994c74
2017-01-24 19:06:40 +00:00
Adrian Roos
e19a36ec12 Merge "AOD: Delay wakeup until interaction with notification" 2017-01-24 19:06:14 +00:00
Todd Kennedy
badc69af3d Don't emit versioncode by default
use --show-versioncode argument if you want to see them

Change-Id: I4ec6236c2c7643e61529765bce24f03555944c3e
Fixes: 34670329
Test: Manually run 'adb shell cmd package list packages' w/ and w/o --show-versioncode
2017-01-24 11:05:47 -08:00
Shuzhen Wang
4bd7abe72a Camera2: Combine API for deferred surface and shared surface
- Unhide API to enable sharing surfaces via OutputConfiguration.
- Combine the APIs for deferred surface and shared surfaces so that
  same functions can be used for both use cases.
  1. setDeferredSurface becomes addSurface.
  2. finishDeferredConfiguration becomes finalizeOutputConfiguration.
- Better documentation on shared surface use cases.

Test: Camera CTS, and preview/video/capture with GCA
Bug: 33777818
Change-Id: I528b221492e07888a2da96658aaf8e7b9c4d1640
2017-01-24 11:05:15 -08:00
Fyodor Kupolov
34cf649e90 Merge "[DO NOT MERGE] Do not log boot times for secondary users and upgrades" into nyc-mr2-dev
am: fcb06b3735

Change-Id: I322bc1977cce2292db5b86d66eaa91519d758950
2017-01-24 19:04:52 +00:00
Fyodor Kupolov
7ed9a12e33 [DO NOT MERGE] Do not log boot times for secondary users and upgrades
am: 1cd8508ba8

Change-Id: Ie6ca85107afcc79e905a748827aef3879807fd36
2017-01-24 19:04:46 +00:00
Todd Kennedy
4d38df3cf2 Make splitName public
I always forget to do this ...

Test: Build application that uses this attribute
Change-Id: I27b23791dfdd3c0eb1a4e172dec8de93ab0eb3f2
2017-01-24 11:02:48 -08:00
Todd Kennedy
316c2f2079 Add versionCode
We need to specify the version code to use when installing
splits since the version on the device might be different
from the latest on the server.

Bug: 25119046
Test: manual
Change-Id: I4ad21f9e5924fcf76a39780e6d98e8d7a1fef5d4
2017-01-24 11:01:27 -08:00
Sanket Agarwal
01f2e67648 Merge "Change HFP Client API to support multi device" 2017-01-24 19:01:14 +00:00
Jesse Hall
85a4011602 Merge "Don't lower priority of EGL Init thread" into nyc-mr2-dev am: 9294b75354
am: b0309b885d

Change-Id: If8bdc3e397757223ee1eb8aa9f779c25c88b5ff0
2017-01-24 19:00:15 +00:00
Jesse Hall
cb3cde5b5d Don't lower priority of EGL Init thread am: 37e63c705e
am: e8a5df8530

Change-Id: I5fe07a9c459e8be4e5ef19aca8d750eecfd44bb3
2017-01-24 18:59:00 +00:00
Paul Duffin
387838793c Merge "Prepare for removal of legacy-test from default targets (Part 2)" am: 5a3a3d298a am: a07f9d522b am: 5aa7e5b46f
am: 762b31f7a4  -s ours

Change-Id: I706c89818b7b27c674e6f5d2d987128269fb6bd6
2017-01-24 18:57:58 +00:00
Winson Chung
d339538a67 Remove dependency on resizable activity to enter PiP.
- Removing the requirement for activities to have both the
  resizeableActivity and supportsPictureInPicture attribute
  to enter PiP.  The activity may still be resized when
  entering picture-in-picture.

Bug: 34256643
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: If6bd4721c53072e5518f554a8c7598705517c132
2017-01-24 10:56:33 -08:00
Android Build Merger (Role)
1224ba4883 Merge "Merge "Expose more ICU4J APIs." am: e5f0221f06 am: 5272231259 am: 94eb984734 am: e4fe6c283f" 2017-01-24 18:56:00 +00:00
TreeHugger Robot
fcb06b3735 Merge "[DO NOT MERGE] Do not log boot times for secondary users and upgrades" into nyc-mr2-dev 2017-01-24 18:55:18 +00:00
Joachim Sauer
02a4fb66ca Merge "Expose more ICU4J APIs." am: e5f0221f06 am: 5272231259 am: 94eb984734
am: e4fe6c283f

Change-Id: I512606cdb9d6b1b793c5f8d3ac0f03967a4a5f02
2017-01-24 18:54:43 +00:00
Android Build Merger (Role)
532e58afd5 Merge "Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" am: c1987487a2 am: 555812a3e2 am: 65e01ec4ed am: 0b4b94b085" 2017-01-24 18:52:54 +00:00
Erik Kline
eaa7180686 Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" am: c1987487a2 am: 555812a3e2 am: 65e01ec4ed
am: 0b4b94b085

Change-Id: I25d009155441f1f3c58f03a11d9b93808d62d963
2017-01-24 18:52:06 +00:00
Android Build Merger (Role)
ecfb39ef68 Merge "DO NOT MERGE frameworks-test: adding missing @SmallTest am: 141923e5b6 -s ours" 2017-01-24 18:51:41 +00:00
Hugo Benichi
593471a045 DO NOT MERGE frameworks-test: adding missing @SmallTest
am: 141923e5b6  -s ours

Change-Id: I8499fb3133f75170de4cfb177ab538d155ccc738
2017-01-24 18:50:34 +00:00
Android Build Merger (Role)
0d4c4c2e51 Merge "Merge "support suw and post-suw cases for default app" am: 9fc8d99c76 am: ea55399ecc am: f2a5e432b0 am: 5ef316e34d" 2017-01-24 18:50:20 +00:00
Chen Xu
f32778c633 Merge "support suw and post-suw cases for default app" am: 9fc8d99c76 am: ea55399ecc am: f2a5e432b0
am: 5ef316e34d

Change-Id: Ib32941ab4965e1554e8e7bdd228fa59f860451a1
2017-01-24 18:49:06 +00:00
Android Build Merger (Role)
7b585fd143 Merge changes from topic 'am-20fc942671704f459c945a1b626498cb'
* changes:
  Merge "Change HFP Client API to support multi device am: c8399321e9" into nyc-mr2-dev-plus-aosp am: 9ac9632ed3
  Change HFP Client API to support multi device am: c8399321e9 am: 3978435d5a
2017-01-24 18:48:38 +00:00
Christine Franks
246117ab53 Merge "Increase Night Display transition to 3 seconds" 2017-01-24 18:46:43 +00:00
Sanket Agarwal
46eccf5a71 Merge "Change HFP Client API to support multi device am: c8399321e9" into nyc-mr2-dev-plus-aosp
am: 9ac9632ed3

Change-Id: I544e52352fd8d66c8f2028ad610f13aa9d6d6ba6
2017-01-24 18:46:11 +00:00
Sanket Agarwal
d2f8ccb8a2 Change HFP Client API to support multi device am: c8399321e9
am: 3978435d5a

Change-Id: Ib9b59a18cb9633caa63c5ac723e9e12c1138f513
2017-01-24 18:45:43 +00:00
Android Build Merger (Role)
5b9b907a98 Merge "Merge "Fix typo in the IS_OMPT_VOICEMAIL field." into nyc-mr2-dev am: 70f920fa0c am: 5c2aa05bfb" 2017-01-24 18:45:14 +00:00
Ta-wei Yen
70021579f7 Merge "Fix typo in the IS_OMPT_VOICEMAIL field." into nyc-mr2-dev am: 70f920fa0c
am: 5c2aa05bfb

Change-Id: I583722ca6ac52499d027f6660393647e6051a4c5
2017-01-24 18:43:58 +00:00
Android Build Merger (Role)
589d3673dc Merge "Fix typo in the IS_OMPT_VOICEMAIL field. am: 57365441d4 am: e696c3d911" 2017-01-24 18:43:27 +00:00
Jason Long
c121dda89a Define contract for AutoFillServiceInfo more precisely.
Change-Id: I295dec0c7318eecdceb962df9c0d888d12e9b654
Bug: 31001899
Test: Manual
2017-01-24 10:43:11 -08:00
Ta-wei Yen
ea0a8bddec Fix typo in the IS_OMPT_VOICEMAIL field. am: 57365441d4
am: e696c3d911

Change-Id: I380e1a15f1c13009b876dd0347ef811cd3f70aed
2017-01-24 18:42:46 +00:00
Android Build Merger (Role)
42f46d2b56 Merge "Merge "Mark the INetworkScoreCache as oneway." am: edadb3efc3 am: 4fcc44dc9a am: ea65f9d392 am: 577aac1385" 2017-01-24 18:42:25 +00:00
Jeremy Joslin
5c5747e541 Merge "Mark the INetworkScoreCache as oneway." am: edadb3efc3 am: 4fcc44dc9a am: ea65f9d392
am: 577aac1385

Change-Id: I9044cfa8445014d08bc416e46811c57e5972d653
2017-01-24 18:41:47 +00:00
Android Build Merger (Role)
34d89134c9 Merge "Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2 am: 20d79203be am: 60e03c36b7" 2017-01-24 18:41:25 +00:00
Nancy Zheng
5299311602 Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2 am: 20d79203be
am: 60e03c36b7

Change-Id: I5790f4748bf2b3f09b4d2efb66ecba117d289844
2017-01-24 18:40:42 +00:00
Android Build Merger (Role)
edcceb495f Merge "Query for the settings package in KeyguardManager instead of hardcoding it. am: e256a18dcd am: 11bdbd1145 am: 52b8412742" 2017-01-24 18:40:21 +00:00
Nancy Zheng
678546838d Query for the settings package in KeyguardManager instead of hardcoding it. am: e256a18dcd am: 11bdbd1145
am: 52b8412742

Change-Id: I050903bafefed0d80961901ac98d67f7cc22dfaa
2017-01-24 18:39:42 +00:00
Android Build Merger (Role)
23dff549bc Merge "Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2 am: d0c5f0047f am: 7a86073718" 2017-01-24 18:39:26 +00:00