Commit Graph

4855 Commits

Author SHA1 Message Date
Svet Ganov
a9ede6c261 am e7cd9001: am 85be0c4e: Fix app ops aidl as it is also used from native.
* commit 'e7cd90012d985b35bb1c93320b8e4afbf94e5f29':
  Fix app ops aidl as it is also used from native.
2015-07-05 18:43:21 +00:00
Narayan Kamath
bef809c4ba am 4da086ee: am 6bcdf90e: Merge "Delete unused testing scripts and WithFramework."
* commit '4da086ee7f4eba64265b28cdc5df9f690d97a7ac':
  Delete unused testing scripts and WithFramework.
2015-07-04 02:57:58 +00:00
Svet Ganov
85be0c4e21 Fix app ops aidl as it is also used from native.
bug:22248271

Change-Id: Ic3f31d1ee4d27c1483c9d19929c19946d4c815c6
2015-07-03 16:23:19 -07:00
Rubin Xu
0dfa0e70c7 am 27f13d12: am b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev
* commit '27f13d125f9eb8053493086871fcb5470c786264':
  Remove ExternalMediaFormatActivity
2015-07-02 16:46:57 +00:00
Rubin Xu
c85c639312 Remove ExternalMediaFormatActivity
This activity is no longer used by any part of the framework.

Bug: 9433509
Change-Id: Iace394b7a11b75ed75b2eefc05990626a7e68ac2
2015-07-02 16:53:57 +01:00
Nicolas Prevot
b06aece751 am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev
* commit 'd16f1252e1e7924a95388a5479d7bb179279f04c':
  Fix the case where an intent bounces several times between users.
2015-07-02 10:52:25 +00:00
Narayan Kamath
c21dab9dcb Delete unused testing scripts and WithFramework.
These scripts haven't worked in a long time now. run_core_test
uses VM options that aren't supported and WithFramework (which is
unmaintained) and run_junit.sh refers to an APK that doesn't
exist anymore.

If anyone wishes to run these tests individually, they can just
use vogar instead :
$ make vogar vogar.jar
$ vogar --mode=activity frameworks/base/tests/CoreTests/android/core/Sha1Test.java

This also allows us to delete the WithFramework class, which was
only referenced by these obsolete scripts.

bug: 22078684
Change-Id: I481f6721d51d50456421a1526c370b93aec9b351
2015-07-02 11:41:52 +01:00
Nicolas Prevot
60373e8060 Merge "Fix the case where an intent bounces several times between users." into mnc-dev 2015-07-02 10:27:58 +00:00
Svet Ganov
55cd6f44fd am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev
* commit '6fe87a565be345c9455f610bbf26d5eaee593683':
  Teach receivers, activities, providers, and services app ops.
2015-07-02 01:02:04 +00:00
Dianne Hackborn
b857216f75 am ab33137d: am 6cc53743: Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev
* commit 'ab33137d68fdb5615d9c6624276d648a0651b953':
  Fix issue #20672970: Notifications are not dismissed on hot word detection
2015-07-02 01:01:27 +00:00
Adam Lesinski
f6fb8d83bd am 499ddbaa: am 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel reports a power field in /proc/uid_cputime" into mnc-dev
* commit '499ddbaa790fc6503cd24c64f8fd57dba098b7d2':
  BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime
2015-07-02 01:00:09 +00:00
Svet Ganov
68ffcf883c Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 2015-07-01 23:59:21 +00:00
Svet Ganov
99b6043dad Teach receivers, activities, providers, and services app ops.
Perform app op check in addition to the permisison check for all four
paltform components - activities, content providers, broadcast receivers,
services - if they are guarded by a permssion that has an associated app
op. This ensures that legacy apps will behave correctly if the permission
of the caller has been revoked, i.e. the app op for that permission was
disabled.

bug:22199666

Change-Id: Ia22d1c38d58b3cd6aabdc655cb7c7bddd85da7a2
2015-07-01 16:20:00 -07:00
Dianne Hackborn
6cc53743f5 Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev 2015-07-01 22:31:18 +00:00
Dianne Hackborn
4e88bcd399 Fix issue #20672970: Notifications are not dismissed on hot word detection
Add new VoiceInteractionSession.closeSystemDialogs() API that closes
everything except the session itself.

Change-Id: If45f1e120d8ca095b6c8055b6485acb5e710820e
2015-07-01 13:41:03 -07:00
Adam Lesinski
43ae441ad7 BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime
Bug:22225706
Change-Id: I4c7d889716345231564c1e96494dc84aab17cf01
2015-07-01 12:09:45 -07:00
Chris Wren
0002b3bab2 am f1cc651b: am c58d1695: Merge changes from topic \'tron\' into mnc-dev
* commit 'f1cc651bf5013e63ad05af38be0c0c4888ea7d80':
  remove double count of panel open
  report notification load on panel reveal
2015-07-01 17:12:19 +00:00
Chris Banes
a50db6c626 am c9812040: am 2bc8485b: Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev
* commit 'c9812040941dad43ca0892bd4dd5e8cf9a219f07':
  Fix memory leak in setActionProvider() - framework edition
2015-07-01 17:11:40 +00:00
Nicolas Prevot
107f7b7bec Fix the case where an intent bounces several times between users.
An intent may bounce several times between users.
In this case, we want mContentUserHint to refer to the original
user.

BUG:19656340
Change-Id: I22a35fab0c228140dcb223899f5e38ff33ee5aed
2015-07-01 17:05:18 +01:00
Chris Wren
c58d169530 Merge changes from topic 'tron' into mnc-dev
* changes:
  remove double count of panel open
  report notification load on panel reveal
2015-07-01 15:33:32 +00:00
Chris Banes
2bc8485ba7 Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 2015-07-01 07:58:05 +00:00
Adam Lesinski
57a324033b am 4718afcd: am 14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev
* commit '4718afcd2e5d52638ba1c4f58b2db6aea01171de':
  BatteryStats: Record cpu power usage from /proc/uid_cputime
2015-07-01 01:06:31 +00:00
Adam Lesinski
14b5701029 Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 2015-07-01 00:40:25 +00:00
Alan Viverette
7802280162 am 29690e20: am 5906f587: Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev
* commit '29690e2015748b367b4794b25a7bd34c0c03a1cb':
  Use non-greedy view to draw background in landscape time picker
2015-06-30 23:05:32 +00:00
Alan Viverette
aa69922ace Use non-greedy view to draw background in landscape time picker
Bug: 21933765
Change-Id: I95d608e9be166308e3a9b013a2c4c17cd4345046
2015-06-30 15:29:13 -07:00
Adam Lesinski
9986350d66 am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
* commit '36eadf9c1d78b047d9e43bf28fe2de417cc1fce5':
  BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
2015-06-30 21:40:24 +00:00
Adam Lesinski
32ddd53466 Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 2015-06-30 20:30:46 +00:00
Adam Lesinski
43f222f02f BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
Bug:18724932
Change-Id: I01cfd18acb3332ad35fd0d48d9c50bc37e5ccd08
2015-06-30 12:54:41 -07:00
Chris Wren
b659c4f44a report notification load on panel reveal
Counts may differ from user perception. For example, if notifications arrive
after the shade is open (even if it is only peeking) there will not be another
panel_reveal before the user sees the shade.  User perception is more accurately
measured by visibility events.

Peek events will report the notificaiton load as 1.

Bug: 20088581
Change-Id: I10221d4b66a18c223aae21e616615f087c65b1e1
2015-06-30 15:30:22 -04:00
Chris Wren
8cc9473fff am 699d2f78: am 392527c4: Merge "add more power manager metrics" into mnc-dev
* commit '699d2f787a8e9fbfcb819f2fb2aaba4c4eb48440':
  add more power manager metrics
2015-06-30 17:43:13 +00:00
Abodunrinwa Toki
0707edf1a8 am 0468a570: am e40d7a63: Merge "Fix Floating toolbar overflow width." into mnc-dev
* commit '0468a5700e2c0112d908fac3d791477192c91a81':
  Fix Floating toolbar overflow width.
2015-06-30 17:23:46 +00:00
Abodunrinwa Toki
3e26dcb550 am 5239997d: am 685a1446: Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev
* commit '5239997d646cb3e5d146db3794e7015f35943fa1':
  Fix floating toolbar flicker in ExtractEditText mode.
2015-06-30 17:23:41 +00:00
Chris Wren
392527c4cc Merge "add more power manager metrics" into mnc-dev 2015-06-30 17:20:29 +00:00
Abodunrinwa Toki
e40d7a6326 Merge "Fix Floating toolbar overflow width." into mnc-dev 2015-06-30 16:56:23 +00:00
Abodunrinwa Toki
685a14468e Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev 2015-06-30 16:53:26 +00:00
Chris Wren
9bb290bcc3 add more power manager metrics
dream start/stop
dream duration
screen timeout setting

Bug: 21893298
Change-Id: I783f72953fc40c0d276a7845daa048e2fe0db78c
2015-06-30 10:10:24 -04:00
Chris Banes
c8f6ecc265 Fix memory leak in setActionProvider() - framework edition
Caused by ActionMenuItem's SubUiVisibilityListener
not being nulled when it is replaced via setActionProvider().

BUG: 22189734
Change-Id: Id4deaa05cd5554ca7bdf969a592e4812e39dcb75
2015-06-30 11:17:57 +01:00
Billy Lau
67dfa49194 am e4c3fd72: am f62f4c94: Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
* commit 'e4c3fd725ea8870756428a6580052a34fc676299':
  Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings.
2015-06-30 09:56:15 +00:00
Billy Lau
f62f4c94a3 Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev 2015-06-30 09:05:34 +00:00
Abodunrinwa Toki
8747f37383 Fix Floating toolbar overflow width.
Also clean out unused methods.

Bug: 22186458
Change-Id: I5ef03cd7938630c0d607b6fecd540f2bd83bbb65
2015-06-29 21:17:22 -07:00
Abodunrinwa Toki
1b57653b50 Fix floating toolbar flicker in ExtractEditText mode.
Fixed by making sure to update visibility immediately after setting a
hide flag on the FloatingToolbarVisibilityHelper.

Bug: 22101632
Change-Id: Iea2d9786c14f6451da836e55f0d880025aa00ed2
2015-06-29 20:43:14 -07:00
Yohei Yukawa
c8deda50fe am e564feba: am 4daf600e: Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev
* commit 'e564feba53f71610afb3bc995497e853654fb2d6':
  Check system locale when picking up an initial SpellChecker.
2015-06-29 21:23:24 +00:00
Yohei Yukawa
4daf600ee0 Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev 2015-06-29 20:42:54 +00:00
Alan Viverette
1537e1358e am 4faa4cbb: am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev
* commit '4faa4cbbca0c9027aa67063a2ad43f008628c5bb':
  Always remeasure ListView scrap used to obtain minimum width
2015-06-29 20:04:39 +00:00
Alan Viverette
a1b647c883 Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 2015-06-29 19:39:29 +00:00
Jae Seo
96c23baff0 am 1d75e527: am 82b3f677: Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev
* commit '1d75e5273e63de811363f22976ced24f629918ce':
  Use AlertDialog for MediaRouteControllerDialog
2015-06-29 17:25:16 +00:00
Jae Seo
82b3f67711 Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev 2015-06-29 17:14:43 +00:00
Yohei Yukawa
174843afb6 Check system locale when picking up an initial SpellChecker.
Since Ia25e7b4f308778891929e31b8cbd741f6848cce4, the TSMS has
picked up the first found spell checker no matter regardless of
the system locale.

The primary goal of this CL is to introduce a low-risk fix for
the situation where two or more spell checker services are
pre-installed but they are well different from each other in
terms of supported languages.  Solving the problem in more
ambiguous and complicated situation is beyond the goal of
this CL.

With this CL, we still pick up the first found spell checker
but also require the spell checker supports a certain locale.
We will try several locales starting with the system locale
to some fallback locales until we find one appropriate spell
checker.  If no spell checker is picked up in this process,
we simply pick up the first one as we have done.

Examples about what locales will be checked are:

A. System locale: en_US
  1. en_US
  2. en_GB
  3. en

B. System locale: en
  1. en
  2. en_US
  3. en_GB

C. System locale: en_IN
  1. en_IN
  2. en_US
  3. en_GB
  4. en

D. System locale: ja_JP
  1. ja_JP
  2. ja
  3. en_US
  4. en_GB
  5. en

E. System locale: fil_PH
  1. fil_PH
  2. fil
  3. en_US
  4. en_GB
  5. en

F. System locale: th_TH_TH
  1. th_TH_TH
  2. th_TH
  3. th
  4. en_US
  5. en_GB
  6. en

Bug: 22042994
Change-Id: I094f1c33430f7904a1dac6167431d6df64a07212
2015-06-26 18:02:54 -07:00
Adam Lesinski
a7a4cccf7d BatteryStats: Record cpu power usage from /proc/uid_cputime
For now we are just recording the power usage and not using it
to calculate battery power usage or app blame. If it looks like
it is accurate, we'll adopt the values from the kernel instead of
estimating ourselves.

Bug:21498425
Change-Id: I6617e3c0ff279a65f4ff84472082f36fe4beb336
2015-06-26 17:45:43 -07:00
Rubin Xu
ba5c07286f am d1858a7d: am 0a202eac: Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev
* commit 'd1858a7d3e648f6c7382bba5bd3982a7ecc15257':
  Use StorageManager.wipeAdoptableDisks to wipe external disks
2015-06-26 22:54:50 +00:00