247839 Commits

Author SHA1 Message Date
Ajay Nambi
7965fa41c3 Add support for LTE CarrierAgregation
Note this may be redesigned in O to better handle the
various bitrate/channel combinations in a sane way.

bug:27360321
Change-Id: If6ffbd02e3a7f170cc041747e32bb624234c3e09
2016-06-23 11:19:03 -07:00
Chris Manton
d4ac4c7786 Merge "Add global settings for cell radio state" into nyc-mr1-dev 2016-06-23 16:42:16 +00:00
Daniel Nishi
9ee8f8066c Merge "On phones, don't show the avatar icon when it is the only user." into nyc-mr1-dev 2016-06-23 16:15:41 +00:00
Lorenzo Colitti
5719a7f478 Merge \"Don\'t loop forever on 0-length options.\" into nyc-dev
am: 7aac630f8e

Change-Id: Icd3c0265ffb30232642f581a7c0031ed55ee6d21
2016-06-23 08:23:18 +00:00
TreeHugger Robot
7aac630f8e Merge "Don't loop forever on 0-length options." into nyc-dev 2016-06-23 08:10:17 +00:00
Lorenzo Colitti
8995d85b94 Don't loop forever on 0-length options.
A malformed RA could cause the Ra constructor in ApfFilter to
enter an infinite loop while holding the class lock. This blocks
IpManager until reboot and drains the battery.

Bug: 29586253
Change-Id: Idaa46b3bc50371db076630881883807c2fa21674
2016-06-23 15:43:34 +09:00
Peng Xu
0ad55d5769 Merge \"Sensor: Make getId() more varied\" into nyc-dev
am: 94b61cb340

Change-Id: I896ed5531533d55bd1ed3f2e3f21d21be04a1f5f
2016-06-23 03:32:46 +00:00
Greg Kaiser
94b61cb340 Merge "Sensor: Make getId() more varied" into nyc-dev 2016-06-23 03:25:46 +00:00
Android Build Merger (Role)
fb801df278 Merge "Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev am: 576e6d27bd" into nyc-mr1-dev 2016-06-23 03:13:11 +00:00
Dianne Hackborn
a8816eaf0e Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
am: 576e6d27bd

Change-Id: Iaf58242c587cbfbc5a98a8083f29a9c7d6b6b940
2016-06-23 03:10:16 +00:00
TreeHugger Robot
1a91866400 Merge "Notify user when application does not support current display zoom" into nyc-mr1-dev 2016-06-23 03:10:11 +00:00
Dianne Hackborn
576e6d27bd Merge "Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)" into nyc-dev 2016-06-23 03:04:26 +00:00
Ta-wei Yen
fbb87a0591 Merge "Add more configuration state for visual voicemail" into nyc-mr1-dev 2016-06-23 02:28:24 +00:00
Andrii Kulian
d82efd36dc Merge \"Don\'t compare intent filters on singleTask adjacent launch\" into nyc-dev
am: 42147f0ff3

Change-Id: Ie767b54e2622a823d8e2fe2a864d788c3a81df74
2016-06-23 02:27:25 +00:00
TreeHugger Robot
42147f0ff3 Merge "Don't compare intent filters on singleTask adjacent launch" into nyc-dev 2016-06-23 02:17:24 +00:00
Philip P. Moltmann
ce7fc6c0a1 Merge \"Do not launch non exposed add printer activity\" into nyc-dev
am: 737be111cc

Change-Id: Ief45b4a87071215700eaba8c21d0aff8ab0c8911
2016-06-23 01:55:52 +00:00
TreeHugger Robot
737be111cc Merge "Do not launch non exposed add printer activity" into nyc-dev 2016-06-23 01:51:08 +00:00
Yohei Yukawa
dc42d7dd13 Merge "Add InputMethodService#exposeContent()" into nyc-mr1-dev 2016-06-23 01:25:39 +00:00
TreeHugger Robot
2b0b1e5a94 Merge "temporarily disable FakeSettingsProviderTest" into nyc-mr1-dev 2016-06-23 01:21:10 +00:00
Andrii Kulian
076b51536c Merge \"Show unsopported display size dialog on relaunch\" into nyc-dev
am: 354c8cde6c

Change-Id: I46f232290ebc5cf924bf696f20eb134076e83b4f
2016-06-23 01:07:00 +00:00
Andrii Kulian
354c8cde6c Merge "Show unsopported display size dialog on relaunch" into nyc-dev 2016-06-23 01:00:36 +00:00
Alan Viverette
54e12ac7f5 Merge \"Clarify docs for PopupWindow width/height parameters\" into nyc-dev
am: 22f887a014

Change-Id: I7311e8cb98da040148e961734646251949975270
2016-06-23 01:00:32 +00:00
Alan Viverette
22f887a014 Merge "Clarify docs for PopupWindow width/height parameters" into nyc-dev 2016-06-23 00:55:52 +00:00
Ta-wei Yen
1121017213 Add more configuration state for visual voicemail
Bug: 26944391
Change-Id: I7e0c2649097edca96d6a78fe2dc250a4b4855133
2016-06-22 17:48:52 -07:00
Baligh Uddin
a0b34b32c3 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: b9aa9b47e7  -s ours

Change-Id: I6800e94bd8ca728af636dc0b46768bee708c6236
2016-06-23 00:43:40 +00:00
Baligh Uddin
b9aa9b47e7 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-23 00:40:04 +00:00
Andrii Kulian
039ba48973 Don't compare intent filters on singleTask adjacent launch
Bug: 29578845
Change-Id: Ic1614fc1f321e80ffdc2ab498d720657f393c239
2016-06-22 17:16:45 -07:00
Jim Miller
0520091641 Merge "Enable fingerprint sensor navigation to invoke QuickSettings - rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"" into nyc-mr1-dev 2016-06-23 00:13:42 +00:00
Dianne Hackborn
17c77536ec Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)
I really have no idea how this can be happening (we check
for a null intent before posting the args), but add another
check before dispatching to try to avoid it.

Change-Id: Ic704850c9750b6a078c49ea628189be568031086
2016-06-22 16:55:47 -07:00
John Reck
0a3a75e121 Merge \"Change approach for windowPositionLostRT\" into nyc-dev
am: 16038a0c5f

Change-Id: Ia6d1b8cfa2c5d126b702eb84895093fa3f893b00
2016-06-22 23:45:34 +00:00
Chris Manton
95a6c899d6 Add global settings for cell radio state
Provide persistable state for cell radio
to handle airplane mode similar to any
other radio in the system.

Change-Id: I87398fe84de3f6a10b0e1002e9e5bf7e61f9441f
2016-06-22 16:44:53 -07:00
Philip P. Moltmann
61209bc924 Do not launch non exposed add printer activity
Change-Id: I0b9b11ea0ce0140c77dff2539b1a0a9dcf1558b0
Fixes: 29580579
2016-06-22 16:41:22 -07:00
John Reck
16038a0c5f Merge "Change approach for windowPositionLostRT" into nyc-dev 2016-06-22 23:38:24 +00:00
Baligh Uddin
12ccb2e52f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29322470
Change-Id: Iec697120d3e8b234bde18e0e37f02ad532796816
2016-06-22 16:33:07 -07:00
Yohei Yukawa
25e0813e6e Add InputMethodService#exposeContent()
This is a follow up CL to my previous CLs [1][2] that introduced
InputConnection#commitContent(InputContentInfo, Bundle) API to enable
IMEs to send a content to the target application.

With this CL, IME developers are able to temporarily expose
InputContentInfo object to the target package without permanently
granting URI permission.  Although calling IMS#exposeContent() is
allowed only for the IME that is currently selected, the client is able
to request a temporary read-only access even after the current IME is
switched to any other IME as long as the client keeps InputContentInfo
object.

Here is a sample code snippet about how to use this mechanism.

  [IME]
  InputContentInfo contentInfo = new InputContentInfo(
          contentUri,
          new ClipDescription(description, new String[]{mimeType}),
          linkUrl);
  exposeContent(contentInfo, getCurrentInputEditorInfo());
  getCurrentInputConnection().commitContent(inputContentInfo, null);

  [App]
  try {
      contentInfo.requestPermission();
      // Load inputContentInfo.getContentUri() here.
  } finally {
      contentInfo.releasePermission();
  }

 [1]: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
      152944f4909c47917473293b258d266435c6ab35
 [2]: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
      adebb52588b098a1af678d4e33a234ef1ce783b2

Bug: 29450031
Change-Id: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
2016-06-22 16:31:41 -07:00
Guang Zhu
3394a8e523 temporarily disable FakeSettingsProviderTest
Bug: 29281167
Change-Id: I463d7707c197bd114de762c86e3b3e574d456e3b
2016-06-22 16:30:09 -07:00
John Reck
f23a1b8e4c Change approach for windowPositionLostRT
Bug: 29547000

Instead of shifting the window off screen fall
back to the UI-thread calculated values. This fixes
a race issue around tear-down where we stop
drawing long before our window is actually no longer
visible, as well as fixes a funky issue with
PRESERVE_GEOMETRY during first draw.

Change-Id: I792d1966f5aaee1e703295ae79166c723b97a1dc
2016-06-22 16:10:07 -07:00
Christopher Tate
77d15483ad Merge \"Fix adb backup/restore\" into nyc-dev
am: 45c79447ad

Change-Id: Ieab601b2676f18f068280a9f5dfd8501fd5978f0
2016-06-22 23:05:05 +00:00
TreeHugger Robot
45c79447ad Merge "Fix adb backup/restore" into nyc-dev 2016-06-22 22:56:37 +00:00
Phil Weaver
403ee9c3e0 Merge \"Report all content changes to a11y services.\" into nyc-dev
am: 8ac5bcbab2

Change-Id: I9338fd3ef749f80c4b0252c7c749fe6e395b3c0a
2016-06-22 22:53:17 +00:00
Phil Weaver
8ac5bcbab2 Merge "Report all content changes to a11y services." into nyc-dev 2016-06-22 22:48:50 +00:00
Fyodor Kupolov
7bc1db96ed Merge \"Use granted userId to look up provider info\" into nyc-dev
am: f9f2c7ceef

Change-Id: Ifb6876fbb424632d3b47ec68686c01b56720b0a4
2016-06-22 22:41:42 +00:00
Adam Lesinski
e0dc709ac8 Merge \"Fix build due to missing abstract method impl\" into nyc-dev
am: aeef7c4748

Change-Id: I38fc7c88e9c4ea5abf50a0bec5f2302c4622605f
2016-06-22 22:41:38 +00:00
Fyodor Kupolov
f9f2c7ceef Merge "Use granted userId to look up provider info" into nyc-dev 2016-06-22 22:28:38 +00:00
Adam Lesinski
aeef7c4748 Merge "Fix build due to missing abstract method impl" into nyc-dev 2016-06-22 22:20:56 +00:00
Jim Miller
07e0384a4e Enable fingerprint sensor navigation to invoke QuickSettings
- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"

Fixes bug 28869612

Change-Id: I321240ee54506633d63a29e987b8d8638c652391
2016-06-22 15:18:13 -07:00
Andrii Kulian
f42cbe8338 Show unsopported display size dialog on relaunch
If the display density change made app restart when it was focused
or we navigate back to it after density change and it makes it
restart - we didn't display unsupported display size dialog.

Bug: 29574686
Change-Id: Ic8fdc8a54df160f947e2d340ab2cb2931bac195d
2016-06-22 14:49:58 -07:00
Daniel Nishi
8ba446c9ba On phones, don't show the avatar icon when it is the only user.
The keyguard user switcher isn't enabled for layouts under 600dp width.
For these thinner devices, we don't show the multi-user switch view when
there is only one user.

In order to update this visibility when user changes occur, we
re-calculate the visibilities when the keyguard status bar view is
made visible again.

Bug: 28795981
Change-Id: I980a4c400adc1d9a6c0ce3465854284997e86596
2016-06-22 14:36:54 -07:00
Roozbeh Pournader
9d2a3188fa Merge "Don't match locales with different scripts in ResourceFilter" into nyc-mr1-dev 2016-06-22 21:20:43 +00:00
Robert Greenwalt
23cac795b0 Merge "Add a Carrier-config specific ratcheter of RATs." into nyc-mr1-dev 2016-06-22 21:12:16 +00:00