Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
208,632 Commits 3 Branches 0 Tags
e3a1ea11528381258f78be011d97cbbf0807cdce
Commit Graph

5076 Commits

Author SHA1 Message Date
Dianne Hackborn
e3a1ea1152 am b365dff5: am bd3d9a0d: am 86f88bc4: am b572b950: am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 
* commit 'b365dff5c23b35170f12dd034fa40f911a00b325':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
 2015-07-24 05:13:06 +00:00
Adam Lesinski
e4e691b802 am a0d43c31: am 602d71db: am 898e3dda: am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit 'a0d43c31df8a5c1d3a52dc28a263cb2c4b1b0092':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-24 05:11:36 +00:00
Jason Monk
180dff0bae am bb8b0368: am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'bb8b0368c5b4ddf5cbf3cb5c0c9bbe9027bc617b':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 05:10:01 +00:00
Dianne Hackborn
b365dff5c2 am bd3d9a0d: am 86f88bc4: am b572b950: am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 
* commit 'bd3d9a0d41f0977b9827c55a98cda3b9e6852b5b':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
 2015-07-24 04:03:47 +00:00
Adam Lesinski
a0d43c31df am 602d71db: am 898e3dda: am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit '602d71db2e32faf2349d6b4c9a1fe71ba9f27e39':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-24 04:02:30 +00:00
Jason Monk
bb8b0368c5 am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'dea13a962356e54881c3924fc07c1aed97a97f46':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 04:01:38 +00:00
Jorim Jaggi
ffbc117229 am f30c5f56: am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'f30c5f56187fed6452d557a44df8b63d8eb130a2':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 22:06:29 +00:00
Jorim Jaggi
f30c5f5618 am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 21:48:48 +00:00
Dianne Hackborn
4a368659ba Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 2015-07-23 00:56:19 +00:00
Dianne Hackborn
d48954fb6b Fix issue #22414729: Checkin start clock time is different from hsitory reset time 
There was a mistake in the code that was supposed to recover from the
initial time on a new device being bad until the real time ultimately
gets set, which was causing us to update the start clock time every time
there was a time change (instead of just when the original start time
appears bad).

Rework all of this, so we now count the start time as bad if it is more
than one year before the current time, only modifying it in that case.
Also when modifying it, adjust the time we set it to take in to account
how much realtime has actually elapsed so far in the battery stats.

Change-Id: If74bd711d9b7618c8f6148a9935c452aaaa7e257
 2015-07-22 17:26:32 -07:00
Adam Lesinski
6625047a3b Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 2015-07-22 21:28:37 +00:00
Adam Lesinski
8a83c61497 BatteryStats: Use English locale for dump and checkin data 
Dump and checkin data is read by tools that expect a consistent
locale.

Bug:22357316
Change-Id: I0d7e6e771c3512278efca7579fe9c4b79b560e28
 2015-07-22 13:50:23 -07:00
Jason Monk
a403159a3b Add metrics to tuner 
Bug: 22462605
Change-Id: I075f9a25630a89e85dd17603297565988c38075b
 2015-07-22 14:41:02 -04:00
Jorim Jaggi
20df623459 Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 2015-07-21 22:46:30 +00:00
Jorim Jaggi
c1244a2995 Merge "Touch, wake and unlock" into mnc-dev 2015-07-21 21:53:11 +00:00
Adam Lesinski
26bfaa5c97 am 208d273e: am e1cd38e9: am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit '208d273edcaa59470fa1a83d96b0b3cd036dbbf1':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 21:43:32 +00:00
Adam Lesinski
208d273edc am e1cd38e9: am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit 'e1cd38e9298f0a62418e95adee64e5f2d7e36297':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 20:24:36 +00:00
Adam Lesinski
a50f43e002 am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit '23e19066de2caf1db1fa0759ac49a1118b59f7a5':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 19:40:24 +00:00
Jorim Jaggi
19695d9711 Add callback to voice interaction session for lockscreen shown 
Bug: 22402726
Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
 2015-07-21 12:35:16 -07:00
Adam Lesinski
23e19066de Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 2015-07-21 19:26:45 +00:00
Adam Lesinski
6856964444 BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources 
Previously we tried to read /d/wakeup_sources to gather kernel wakelock data. If that
fails we used the older sys file /proc/wakelocks.
N7 has both /proc/wakelocks and /d/wakeup_sources, but /proc/wakelocks
has the actual data we need. All other devices are using /d/wakeup_sources, so
only N7 experienced a loss of kernel wakelock data.

The original regression was introduced here: ag/659258

Bug:22556242
Change-Id: I51ec68e957f587bc1466e24f0a1dbc8cd7753ac6
 2015-07-21 12:08:56 -07:00
Jorim Jaggi
368c53a998 am 96ee8e8f: am 537cd82a: am 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev 
* commit '96ee8e8f04252ff7289e7e79289706b05637e40b':
  Fix SysUI crashes on svelte devices
 2015-07-21 00:22:35 +00:00
Jorim Jaggi
96ee8e8f04 am 537cd82a: am 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev 
* commit '537cd82ad5ab416eae2199d2dfe4634f974c89c8':
  Fix SysUI crashes on svelte devices
 2015-07-21 00:08:08 +00:00
Jorim Jaggi
740452e875 Touch, wake and unlock 
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.

Bug: 21855614
Change-Id: I5f43df17fa5e4e9c6a6392eef4a4590b07df4f96
 2015-07-20 23:52:20 +00:00
Jorim Jaggi
e58ba842de am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev 
* commit '8924f23d3ecdcb2b1ce4dbc9bb4fbb9ddfa62710':
  Fix SysUI crashes on svelte devices
 2015-07-20 23:24:21 +00:00
Qiwen Zhao
06e260b8db Merge commit '01fda527' 
Change-Id: I08b5e7e8576f463c00be12879b465fa9c8cda8f5
 2015-07-20 15:52:23 -07:00
Jorim Jaggi
e446dcee8f Fix SysUI crashes on svelte devices 
Bug: 22602295
Change-Id: Idac0d62683c0f6f7cf7b795967632e34d771c4f7
 2015-07-20 15:47:15 -07:00
Dianne Hackborn
01fda52778 am ed3b4253: am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit 'ed3b42539a4d883533177d008c7ffb2a58e50af6':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:42:32 +00:00
Dianne Hackborn
3aefa43830 am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit '78ead58df03e476d656c7e875fff9ade13b727c1':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:02:32 +00:00
Dianne Hackborn
78ead58df0 Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 2015-07-20 19:50:50 +00:00
Dianne Hackborn
17f693520d Fix issue #22531747: Assist info should declare if user has disabled... 
...context and/or screenshot

Added new API to find out what contextual data has been globally disabled.

Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).

Also added a new Activity.showAssist() API because...  well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.

Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
 2015-07-20 12:49:10 -07:00
Dianne Hackborn
16c268ee90 am c8457784: am 9b7c2ee7: am 35534fb4: am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit 'c8457784df15e6c4361bce65628c56b9326977cf':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 23:24:35 +00:00
Dianne Hackborn
c8457784df am 9b7c2ee7: am 35534fb4: am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit '9b7c2ee7d805e632d215a0fd7f4696b36bd510a7':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 23:07:19 +00:00
Dianne Hackborn
fb03aa36a4 am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit '5c269121d8ea0bf3f530f2314695e189ffdb3165':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 22:17:58 +00:00
Dianne Hackborn
5c269121d8 Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 2015-07-17 22:03:46 +00:00
Dianne Hackborn
f38c4ee903 Work on issue #22556778: Starting under voice control not allowed 
The ResolverActivity is voice capable.  In fact, it is capable
of EVERYTHING.

Change-Id: I37c4476d546f61fee3540b747aff77e88b702d48
 2015-07-17 11:21:26 -07:00
Derek Sollenberger
82d740606e Merge "Remove unused HardwareLayer and associated code for generic views." 2015-07-17 13:58:07 +00:00
Adam Powell
7e4c29e2da am 7e89a40c: am e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit '7e89a40c2e6a9adad41724c0db0019e2d48fde03':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 01:31:37 +00:00
Adam Powell
7e89a40c2e am e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit 'e0968e14e46c941434f28ec633473d49b9583bf9':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 01:17:25 +00:00
Adam Powell
2fca481233 am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit '9ba039bbe9478c56ae3875a9933d3ba754367dc2':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 00:32:58 +00:00
Adam Powell
666d82a6d5 Update ChooserTarget constructor to take ComponentName, Bundle 
Simplify ChooserTarget handling by requiring a target component and an
extras bundle instead of a full PendingIntent/IntentSender. This
simplifies the handling of URI grants from sending apps.

Prune ChooserTargets that point at ComponentNames that don't share a
package with the original matching Activity target or that aren't
exported so that we don't show the user something they can't launch.

Bug 22516282

Change-Id: I3439c0910b4fa4f95c7a881b529942c96ffc953e
 2015-07-16 16:29:59 -07:00
Svet Ganov
28e7313992 am 71d12704: am 475858c3: am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit '71d12704f64eeace695a6b8e0cd8f36007b96270':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 23:20:46 +00:00
Svet Ganov
71d12704f6 am 475858c3: am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit '475858c34d21b38d9be4356a7fc654eb879e34b5':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 23:05:41 +00:00
Dianne Hackborn
6648b73cb9 am ee924ded: am 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit 'ee924dedcc36d64a72652bb3e5fb64d5d5c4c6a4':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 22:53:32 +00:00
Dianne Hackborn
ee924dedcc am 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit '587f0c58f506b167667c789c16292c4e405eac1f':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 22:36:06 +00:00
Svet Ganov
c00e49b6e4 am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit 'd4b566bf56333de708908ce4accb5fb067be64f0':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 22:23:38 +00:00
Svet Ganov
d4b566bf56 Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 2015-07-16 22:22:01 +00:00
Dianne Hackborn
9236af43d8 am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 21:51:49 +00:00
Dianne Hackborn
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +00:00
Derek Sollenberger
8d94835b49 Remove unused HardwareLayer and associated code for generic views. 
bug: 20461288
Change-Id: I4efa9e31a42682a8a90438d52c9c665a582f950c
 2015-07-16 14:09:45 -04:00