Commit Graph

310696 Commits

Author SHA1 Message Date
Jerome Gaillard
e34edfc8e5 Merge "Update layoutlib following Changes I2500bd4c and If456266f" 2017-03-16 16:16:17 +00:00
tony.ys_liu
180f5e918c Merge "Set system server's class loader for wrap.system_server" am: 8d2d6bfa12 am: 959628a32e
am: d794855fba

Change-Id: Id7f48fe3c4b1855e8e9a450c70db00f057502ad4
2017-03-16 15:54:02 +00:00
tony.ys_liu
d794855fba Merge "Set system server's class loader for wrap.system_server" am: 8d2d6bfa12
am: 959628a32e

Change-Id: I88bfbb33aa1247a9b0d1d468b35621ed89abcc51
2017-03-16 15:48:55 +00:00
tony.ys_liu
959628a32e Merge "Set system server's class loader for wrap.system_server"
am: 8d2d6bfa12

Change-Id: Iba4af152c9f29ad6e8c9bb1b0a1047e96d287c6b
2017-03-16 15:42:53 +00:00
Treehugger Robot
8d2d6bfa12 Merge "Set system server's class loader for wrap.system_server" 2017-03-16 15:33:33 +00:00
Christine Franks
96d6e13e4d Merge "Change system alert window setting proto comments" 2017-03-16 15:25:56 +00:00
Julia Reynolds
41103f4212 Support for showing deleted channel count in settings.
Bug: 36119790
Test: runtest systemui-notification
Change-Id: Ie30243314d64ded66267d0dc85cc0ad940d917f8
2017-03-16 14:24:17 +00:00
TreeHugger Robot
e7f265119d Merge "Fix light status bar transition" 2017-03-16 14:22:56 +00:00
Julia Reynolds
1d97e6a0c1 Remove resource id channel/group name fields
Apps can listen for the LOCALE_CHANGED broadcast to
change names if needed.

Fixes: 35336590
Test: runtest systemui-notification, cts, manual
Change-Id: I62d2778f61e99200692755a6f268828a374837e6
2017-03-16 14:20:28 +00:00
TreeHugger Robot
87f0f83442 Merge "Fix SynthethicPassowrdManager unit tests" 2017-03-16 13:49:16 +00:00
Jerome Gaillard
95f36e23c3 Update layoutlib following Changes I2500bd4c and If456266f
Test: layoutlib tests
Change-Id: Idd3993bdc4010fa80a8c78ad80998bc7586322a5
2017-03-16 12:42:37 +00:00
Rubin Xu
8b30ec3f49 Fix SynthethicPassowrdManager unit tests
Mock DevicePolicyManager in the unit tests.

Bug: 34600579
Test: runtest frameworks-services -c com.android.server.SyntheticPasswordTests
Change-Id: Ieca30a74d7d9d867994e912d188231510f54e76c
2017-03-16 11:55:27 +00:00
Clara Bayarri
c4a6d29ac6 Merge "Provide ApplicationContext to Typeface for font requests" 2017-03-16 09:40:39 +00:00
TreeHugger Robot
73ba9da6e8 Merge "Clarify release/close java docs" 2017-03-16 07:20:15 +00:00
Elliott Hughes
ec50f7031c Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running." am: ef9c425416 am: 40c4210f8f
am: 5c8e3edf48

Change-Id: I4fbdbbb12b7854fcca22de2790c14d315ef44c53
2017-03-16 05:50:23 +00:00
Elliott Hughes
5c8e3edf48 Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running." am: ef9c425416
am: 40c4210f8f

Change-Id: I264f92773692b2c5cdc58adac808630a31d2569f
2017-03-16 05:45:47 +00:00
Elliott Hughes
40c4210f8f Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running."
am: ef9c425416

Change-Id: I0ea94267a6d6cfa137e77edde288632d04a71bcd
2017-03-16 05:40:47 +00:00
Elliott Hughes
ef9c425416 Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running." 2017-03-16 05:31:24 +00:00
Rob Carr
287452cf40 Merge "Delete some SurfaceView support code." 2017-03-16 05:07:10 +00:00
Jeff Tinker
5d9a8acdac Clarify release/close java docs
bug:25372187
Change-Id: Ibe13943731e53efa9408b0d6bf105063f3ce4334
2017-03-15 21:46:42 -07:00
Sooraj Sasindran
680d5f529c Merge "Support Signal strength offset" am: 98d499877f am: a98cefc55c
am: 51b64c7c0a  -s ours

Change-Id: Ief288382a03c12fb1ea133a53cc9a2215eaab729
2017-03-16 03:36:22 +00:00
Sooraj Sasindran
51b64c7c0a Merge "Support Signal strength offset" am: 98d499877f
am: a98cefc55c

Change-Id: Ib545af88fb521465f4b2b410c7eab0c9d20dd317
2017-03-16 03:24:14 +00:00
Sooraj Sasindran
a98cefc55c Merge "Support Signal strength offset"
am: 98d499877f

Change-Id: I3087c3f8d6f975f399dfcf8aa8dd734f78caf69f
2017-03-16 03:19:37 +00:00
Sooraj Sasindran
98d499877f Merge "Support Signal strength offset" 2017-03-16 03:13:30 +00:00
Erik Kline
b7a55f4a4b Merge "Add blocking and retrying wrappers for INetd uses." am: ba8c613e16 am: 143d0853a2
am: 300c56a977

Change-Id: Ia9d45d8fd636e918c8299b26163de0650f8ddac5
2017-03-16 02:58:10 +00:00
Erik Kline
300c56a977 Merge "Add blocking and retrying wrappers for INetd uses." am: ba8c613e16
am: 143d0853a2

Change-Id: I8957b3506f92257cfa052580156d7a87645d11b2
2017-03-16 02:54:02 +00:00
TreeHugger Robot
44d5d0c2fb Merge "ConnectivityMetricsEvent: add ifname, netid, transports" 2017-03-16 02:50:23 +00:00
Erik Kline
143d0853a2 Merge "Add blocking and retrying wrappers for INetd uses."
am: ba8c613e16

Change-Id: Iae8ea51852ed6991e3b9ed89297c8a932b9224f3
2017-03-16 02:49:36 +00:00
Treehugger Robot
ba8c613e16 Merge "Add blocking and retrying wrappers for INetd uses." 2017-03-16 02:42:17 +00:00
TreeHugger Robot
46cda5971e Merge "Update strings" 2017-03-16 02:22:28 +00:00
TreeHugger Robot
2e62fdbc6d Merge "Renaming the second active event to avoid confusion." 2017-03-16 01:54:10 +00:00
TreeHugger Robot
5bf03b7640 Merge "Allow users to manually request Autofill." 2017-03-16 01:33:46 +00:00
Sooraj Sasindran
78ccde1c9d Merge "Support Signal strength offset" 2017-03-16 01:27:44 +00:00
TreeHugger Robot
65d1c294b1 Merge "Move expensive TextClock operations to onAttach" 2017-03-16 01:10:23 +00:00
Ray Essick
5204ad0a2a Merge "Integrate API Council feedback into Media Metrics APIs" 2017-03-16 01:02:25 +00:00
Hugo Benichi
946b7e424e ConnectivityMetricsEvent: add ifname, netid, transports
This patch adds new fields to ConnectivityMetricsEvent to make it more
symmetric to IpConnectivityEvent in ipconnectivity.proto.

Follow-up patches will start populating these fields for users of
IpConnectivityLog.

Test: unit tests updated, $ runtest frameworks-net passes
Bug: 34901696
Change-Id: I396767cdfcf38cce893c0d6e1f4524f12e3fdc64
2017-03-16 09:58:02 +09:00
Mathias Agopian
9ed74a81d9 Merge "Get rid of LinearTransform" 2017-03-16 00:51:33 +00:00
Fan Zhang
5545d42398 Update strings
Change-Id: I38fcd900cdadea40f96fa2f78587943662a6771f
Fix: 36291553
Test: builds
2017-03-15 17:40:49 -07:00
Android Build Merger (Role)
fe12209334 Merge "Merge "integrate portal webview to the default app" am: e3ece71f2e am: dd7ff3586c am: 916aef7eb8 -s ours" 2017-03-16 00:38:59 +00:00
Chen Xu
402db490b0 Merge "integrate portal webview to the default app" am: e3ece71f2e am: dd7ff3586c
am: 916aef7eb8  -s ours

Change-Id: Ibb9c094dcb41bea9749f0a119464ee0a23aab224
2017-03-16 00:38:16 +00:00
Hugo Benichi
97035b4abf Merge "Connectivity metrics: simplify ConnectivityMetricsEvent" 2017-03-16 00:37:47 +00:00
Kweku Adams
134c59bb40 Renaming the second active event to avoid confusion.
BUG: 23532995
Test: make -j 32 ...

Change-Id: I8d44e98520f40f46727cb57ba77932eee2b1b0ea
2017-03-16 00:33:33 +00:00
Christine Franks
47175c3d4a Change system alert window setting proto comments
Bug: 36070413
Test: only comments changed
Change-Id: I2bb2a8a2be5a0535997e4cb382b52cb98ded6b09
2017-03-16 00:30:21 +00:00
Casey Burkhardt
98d1dba2ab Merge "Display magnification via the nav bar Accessibility Button" 2017-03-16 00:26:53 +00:00
Conrad Chen
287a68e62a Merge "Deprecate settingsActivity field in TvInputService" 2017-03-16 00:16:15 +00:00
TreeHugger Robot
32eb4602c1 Merge "AudioRecord: more information in text of IllegalArgumentException" 2017-03-16 00:10:33 +00:00
Chen Xu
916aef7eb8 Merge "integrate portal webview to the default app" am: e3ece71f2e
am: dd7ff3586c

Change-Id: I929abe090a0e9632e75004a026af3e93c2898cb8
2017-03-16 00:06:58 +00:00
Chen Xu
dd7ff3586c Merge "integrate portal webview to the default app"
am: e3ece71f2e

Change-Id: I3c46e8bd47d087701b3c643e59bc9e373dab00bb
2017-03-16 00:02:28 +00:00
TreeHugger Robot
c2d761a445 Merge "Adapt unpaged cursors to paged requests." 2017-03-15 23:59:26 +00:00
Chen Xu
e3ece71f2e Merge "integrate portal webview to the default app" 2017-03-15 23:52:53 +00:00