Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,549 Commits 3 Branches 0 Tags
06f931e8eae92cbfb24983502d9cdf41f1284dad
Commit Graph

63947 Commits

Author SHA1 Message Date
Alan Viverette
06f931e8ea Merge "API review feedback for ProgressBar" into nyc-dev am: 5500bb1d6d 
am: c1a3af4546

* commit 'c1a3af4546782846ef94e4ffd960133107707a88':
  API review feedback for ProgressBar

Change-Id: I0bdf04c9e8a276479976d8647d208a7d95a4f506
 2016-04-21 21:29:22 +00:00
Alan Viverette
0a80cd5cc0 Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d 
am: d1fb914324

* commit 'd1fb9143244dcb46b28a0edbae88f8f5815d31bf':
  Don't overwrite vertical and horizontal offsets unless explicit

Change-Id: I0eca2b999be91c6c38df392ef62a4177ce20069f
 2016-04-21 21:29:18 +00:00
Alan Viverette
5500bb1d6d Merge "API review feedback for ProgressBar" into nyc-dev 2016-04-21 21:21:56 +00:00
Alan Viverette
e84393674d Merge "Don't overwrite vertical and horizontal offsets unless explicit" into nyc-dev 2016-04-21 21:21:35 +00:00
Hyunyoung Song
b99a507ec0 Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev 
am: 22d91b0eb4

* commit '22d91b0eb40137e6236d7af5d2857df97648d15b':
  add @RemotableViewMethod to TextView#setEnabled b/28304068

Change-Id: I7d8f610e543ad1ef9937b342c04feb75774c0b23
 2016-04-21 21:06:24 +00:00
Hyunyoung Song
22d91b0eb4 Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev 2016-04-21 21:04:25 +00:00
Hyunyoung Song
7b77e0c765 add @RemotableViewMethod to TextView#setEnabled 
b/28304068

Change-Id: Ia5464030a65c87dacdd75e5be331da017d7ef593
 2016-04-21 13:41:56 -07:00
Mihai Nita
f3aa91d9a4 Merge "Framework: change the TTS text to use the current locale" into nyc-dev 
am: 344bd5c63d

* commit '344bd5c63dfbe9a6aaef68144d04d3613563c080':
  Framework: change the TTS text to use the current locale

Change-Id: I23d1acfd0b53fddeec4e9ad183d90d1cf7a9708e
 2016-04-21 20:01:18 +00:00
Robert Carr
674bedee2e Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev 
am: 37696cccd8

* commit '37696cccd8925ca6e4aa6f2ca6f29807066c7f1e':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I2b63fc161dc7dccf21080ad7dd27d9b958808ad1
 2016-04-21 20:01:15 +00:00
Mihai Niță
344bd5c63d Merge "Framework: change the TTS text to use the current locale" into nyc-dev 2016-04-21 19:55:43 +00:00
Rob Carr
37696cccd8 Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev 2016-04-21 19:52:02 +00:00
Yohei Yukawa
1f79c0fea1 Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 
am: d67a1ca49b

* commit 'd67a1ca49b138056d53490322ffdadef61d95fec':
  Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I8eb560fa0176836894164a9e7856d44bd0b91a09
 2016-04-21 17:16:19 +00:00
Yohei Yukawa
d67a1ca49b Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 2016-04-21 17:11:55 +00:00
Tony Mak
f5f982f014 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev 
am: d3589ee715

* commit 'd3589ee715e397e61025265adc883c9ed3be4f56':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: Id0e6e3cbc8cbea4e87625f479eb0d83dbf22266e
 2016-04-21 15:53:57 +00:00
Tony Mak
646fe9913e Fix wrong app is launched after solving challenge from tapping notification 
PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.

Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.

Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix: 28309964
 2016-04-21 16:43:08 +01:00
Erik Kline
0f155c5778 Merge "Expand NetworkMonitor metrics" into nyc-dev 
am: b99d6af3ab

* commit 'b99d6af3ab406db14d161cdc0000ed521957d7ca':
  Expand NetworkMonitor metrics

Change-Id: I1d5475b998b6e29ad8bf43f8e457d9f4db85527a
 2016-04-21 05:28:30 +00:00
TreeHugger Robot
b99d6af3ab Merge "Expand NetworkMonitor metrics" into nyc-dev 2016-04-21 05:24:40 +00:00
Hugo Benichi
9fc5843fa8 Merge "Some fixes in ConnectivityService event logging" into nyc-dev 
am: 7261fb27de

* commit '7261fb27de16bb6d3ebd81bd3b73062bd212ea7e':
  Some fixes in ConnectivityService event logging

Change-Id: I0ca861a1d35eb6cdb5490d04a725d64465eebc31
 2016-04-21 04:12:56 +00:00
Hugo Benichi
d8a8ea1e29 Merge "Various fixes in IpReachability event logging" into nyc-dev 
am: 75f0346167

* commit '75f0346167f9b8beb8d4b941e7a4ca8228e0737a':
  Various fixes in IpReachability event logging

Change-Id: Ibfea132ad824990464e4d488a717d34bd027b891
 2016-04-21 04:04:01 +00:00
Hugo Benichi
7261fb27de Merge "Some fixes in ConnectivityService event logging" into nyc-dev 2016-04-21 04:02:55 +00:00
Erik Kline
a488c23dd5 Expand NetworkMonitor metrics 
- add netid to CaptivePortalStateChangeEvent
    - add NetworkMonitorEvent for simple duration measurements

Bug: 28204408
Change-Id: I62035e07d64013878a0bce30c67c929c2c7e7a85
 2016-04-21 13:02:55 +09:00
Hugo Benichi
75f0346167 Merge "Various fixes in IpReachability event logging" into nyc-dev 2016-04-21 03:54:18 +00:00
Ruchi Kandoi
fb8c76df29 Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev 
am: 316c68f144

* commit '316c68f144946a3019cc8f314921e8588c766b71':
  fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link

Change-Id: If4cc351b8674343cbb83e22bcfccf9e7b4d00484
 2016-04-21 02:46:51 +00:00
Ruchi Kandoi
316c68f144 Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev 2016-04-21 02:37:50 +00:00
Hugo Benichi
5f16f760ad Some fixes in ConnectivityService event logging 
Bug: 28204408
Change-Id: I44ed9539bb213a845c2bcc2861c947af7c3c9ef4
 2016-04-21 11:03:08 +09:00
Christopher Tate
11c07421da Merge "Only invoke k/v helpers during k/v operations" into nyc-dev 
am: 157ae98762

* commit '157ae987627ce93939c40dc6f1f3913b243973ae':
  Only invoke k/v helpers during k/v operations

Change-Id: I802010298db254ffb659b68ec4ac2ac569741a5b
 2016-04-21 01:20:17 +00:00
Christopher Tate
c9e584b422 Only invoke k/v helpers during k/v operations 
In particular, don't try to call the k/v wallpaper restore helper's
onRestoreFinished() if we are actually doing a full-data restore.

Bug 28132784

Change-Id: I2eaf748f6d54601f0ca195ae2781aa177daf0b93
 2016-04-21 01:11:06 +00:00
Amith Yamasani
bc25c87c57 Merge "Throw better exception when startVoiceActivity fails" into nyc-dev 
am: 2be4c463bc

* commit '2be4c463bc6411cf6fb9e2a4be0cbb90c485d0de':
  Throw better exception when startVoiceActivity fails

Change-Id: Ie8dfd6ed1f366e24418f352c810281ca687c70fb
 2016-04-21 00:50:10 +00:00
Adam Lesinski
051b810da6 Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev 
am: c708cf6340

* commit 'c708cf6340e623202e562992e6ef4062ace84cab':
  BatteryStatsHelper: Include screen on baseline power draw

Change-Id: I6ba6f66ebc9d4ffebc8e6f5444957d0a345da4fd
 2016-04-21 00:50:07 +00:00
Shreyas Basarge
f153182db7 Merge "Fix logspam by JobInfo" into nyc-dev 
am: bb9dd3c9fd

* commit 'bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
  Fix logspam by JobInfo

Change-Id: I58ec5ed68dad8df8c5f73c3e313181c36f0d27dd
 2016-04-21 00:50:04 +00:00
TreeHugger Robot
2be4c463bc Merge "Throw better exception when startVoiceActivity fails" into nyc-dev 2016-04-21 00:46:32 +00:00
Adam Lesinski
c708cf6340 Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev 2016-04-21 00:39:59 +00:00
Dianne Hackborn
bb9dd3c9fd Merge "Fix logspam by JobInfo" into nyc-dev 2016-04-21 00:39:43 +00:00
Tim Murray
b16a93f955 Merge "Increase the max binder thread pool size for system_server." into nyc-dev 
am: 150553756f

* commit '150553756f89a51cc70b24cd9dbab4bdfba0fc59':
  Increase the max binder thread pool size for system_server.

Change-Id: I8312e28eac4b6b00b94af85d0e887448ec849652
 2016-04-21 00:39:06 +00:00
Philip P. Moltmann
458216854a Merge "Prevent printing from finishing activity." into nyc-dev 
am: 41304f47f4

* commit '41304f47f4d5d6cdd4d160c9553f47b1e641aff8':
  Prevent printing from finishing activity.

Change-Id: Ia3de45edab34f91a0da0f0474c8e870f3f132e45
 2016-04-21 00:34:36 +00:00
Tim Murray
150553756f Merge "Increase the max binder thread pool size for system_server." into nyc-dev 2016-04-21 00:32:47 +00:00
Philip P. Moltmann
41304f47f4 Merge "Prevent printing from finishing activity." into nyc-dev 2016-04-21 00:31:42 +00:00
Philip P. Moltmann
a70594be57 Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev 
am: 50a871857d

* commit '50a871857d4a6c6f8d6ce8b3621414e60a32eaf6':
  Print API for N: Fix docs and change interfaces as requested.

Change-Id: Id9b2b228001802d6b5325e6b01d318e265541441
 2016-04-21 00:23:34 +00:00
Ruchi Kandoi
a2689dcf71 fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link 
Change-Id: Ic12b98cbafcc8c81eadba119ab416a9eddb7214a
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2016-04-20 17:22:27 -07:00
Hugo Benichi
25bf8f5d56 Various fixes in IpReachability event logging 
- fold IpReachabilityMonitor* classes into a single IpReachabilityEvent.
- only log an event for NUD_FAILED Netlink answers.
- distinguish between NUD_FAILED with or without lost of provisioning.
- do not record host ip addresses.
- record interface name instead of interface index when losing
  provisioning.

- also return an error code when probeNeighbor fails, and log this error
  code in IpReachability events.

Bug: 28204408
Change-Id: I5f0def0ab1ace7e467a0c69b3b82d07ef2252307
 2016-04-21 09:18:50 +09:00
Vladislav Kaznacheev
bd048c598d Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev 
am: 28609360cf

* commit '28609360cfe25446ab5b0ba165af363378b3d805':
  Add JavaDoc for View.updateDragShadow

Change-Id: I2d5488d78f4095cdfa3558dc0a4e3a785c420648
 2016-04-21 00:18:20 +00:00
Eino-Ville Talvala
a6587338ea Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev 
am: 5856779c3a

* commit '5856779c3a3e00e256cdf5cb571a85975d781cf4':
  Camera2: Ignore exception on double-completed capture sequences.

Change-Id: I7905d6ef70ba031736fcc2cea9f1ffdabe09851e
 2016-04-21 00:17:55 +00:00
Philip P. Moltmann
50a871857d Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev 2016-04-21 00:17:48 +00:00
TreeHugger Robot
28609360cf Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev 2016-04-21 00:02:08 +00:00
Yohei Yukawa
46ac35d09b Accept null subtype in InputMethodSubtypeHandle. 
There are two types of IMEs:
 A. IMEs that have one or more subtypes
 B. IMEs that have no subtype

The initial implementation to update hardware keyboard layout per
subtype change of layout (See Bug 25752812) has supported IMEs in the
category A only, and IMEs in the category B are just ignored in both
system and Settings app.

In order to support IMEs in the category B, InputMethodSubtypeHandle and
related methods need to accept null InputMethodSubtype. Technically
this is a straightforward change, because in InputMethodManagerService
we have already used InputMethodUtils.NOT_A_SUBTYPE_ID for those IMEs in
the category B.  We also need to update Setting App, which will be done
by a different CL [1].

  [1]: I46b9c5b018f08e3eaa4614a0893db0be91652f3c

Bug: 28182650
Change-Id: Ia013784a594ad3beaf30976d047f5ac0fa8185be
 2016-04-20 16:59:45 -07:00
Eino-Ville Talvala
5856779c3a Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev 2016-04-20 23:55:11 +00:00
Shreyas Basarge
b0c83ec062 Fix logspam by JobInfo 
Print interval clamp message
only for periodic jobs having
period/flex less than the minimum value.

Bug: 28296128
Change-Id: Id0d7c3b56048582a490bb8214eca491ec2bbdc93
 2016-04-21 00:44:58 +01:00
Adam Lesinski
2988b8f641 Merge "Doze settings example not matching real keys" am: 570a13f 
am: 790699d

* commit '790699db64ee18d143cd9813e91044fcc5a26713':
  Doze settings example not matching real keys

Change-Id: I5c1a0757f5db2ba3ca2fcf37e77641ac820fbe6f
 2016-04-20 23:42:01 +00:00
Adam Lesinski
40c611853e Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev 
am: 1362ae0

* commit '1362ae062a196c8450a0b649dd0c5af66d1f05a1':
  ResourcesManager: Throw exception if failed to load asset path

Change-Id: I59a5eeb3502d12382e30faceb769eaef719b65d1
 2016-04-20 22:56:11 +00:00
Henrik Baard
790699db64 Merge "Doze settings example not matching real keys" 
am: 570a13f

* commit '570a13f0cb233b4a216243025a9fed3df3c72849':
  Doze settings example not matching real keys

Change-Id: I62dade8bece244e9033a230c1f116f8caad35a6f
 2016-04-20 22:51:47 +00:00