Commit Graph

4876 Commits

Author SHA1 Message Date
Todd Kennedy
9f86026444 resolved conflicts for 7de7e0b0 to stage-aosp-master
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
2015-09-25 15:06:49 -07:00
Todd Kennedy
fa54ab7950 Pass dexopt flags as integer
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.

Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
2015-09-25 13:52:33 -07:00
Todd Kennedy
4e32174517 resolved conflicts for cafacef6 to stage-aosp-master
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
2015-09-24 14:34:06 -07:00
Andreas Gampe
55fe944f98 Frameworks/base: Propagate boot status to installd
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
(cherry picked from commit 06bb908b78)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
2015-09-24 12:27:25 -07:00
Elliott Hughes
aa31169804 am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit '0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
  WrapperInit: remove dead execStandalone method
2015-09-22 15:42:36 +00:00
Daniel Micay
13eac10a26 WrapperInit: remove dead execStandalone method
This became dead with the removal of support for the non-runtime-init
code path in f48029f00a.

Change-Id: Id68e0da4658e83f0d3bfd8645152165faacac5fa
2015-09-21 18:14:56 -04:00
Yasuhiro Matsuda
10191dd9d2 am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '53f1a815b4401f10cd833217143da44ab0408dcc':
  Remove unnecessary finally blocks for tracing.
2015-09-04 02:34:58 +00:00
Yasuhiro Matsuda
25878b2888 Remove unnecessary finally blocks for tracing.
BUG: 22207144
Change-Id: I2b15bb7c4055a1ad589b433d4f253868813ab311
2015-09-03 16:27:13 +09:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
2015-09-02 22:57:53 +09:00
Yasuhiro Matsuda
1ab43d5978 Add trace code to system server.
- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.

BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327
2015-08-27 12:22:07 +09:00
Dianne Hackborn
4519b64fda am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
2015-08-19 18:31:29 +00:00
Dianne Hackborn
865b79b43b Fix issue #23326715: Clarify --checkin/-c options in batterystats
Change-Id: I3f026447ba7c6d2c3f9ef065269c31a78cf73512
2015-08-18 17:33:00 -07:00
Daniel Sandler
fa42d28f60 am 8ad3e817: Merge ""I tried to think of the most harmless thing."" into mnc-dev
* commit '8ad3e81701a20169b3410a231302ce0c82f95100':
  "I tried to think of the most harmless thing."
2015-08-14 20:03:08 +00:00
Daniel Sandler
8ad3e81701 Merge ""I tried to think of the most harmless thing."" into mnc-dev 2015-08-14 19:59:35 +00:00
Dan Sandler
deafeedc81 "I tried to think of the most harmless thing."
Bug: 21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
2015-08-14 15:25:55 -04:00
Svetoslav Ganov
03e64e4edd am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
* commit 'b045331fcb033507072bfd7899a147bb2be7176e':
  Add GTS test to ensure valid default permission grants - framework
2015-08-14 15:12:06 +00:00
Svet Ganov
52153f4c05 Add GTS test to ensure valid default permission grants - framework
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.

bug:23043018

Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
2015-08-12 21:57:59 -07:00
Raph Levien
9dc2d5cd5b am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
* commit 'beabcb92cbdec6f68bd712c9972e6f8377b78f46':
  Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:08:13 +00:00
Raph Levien
beabcb92cb Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 2015-08-12 21:00:07 +00:00
Clara Bayarri
f95ed10d9d Fix Insertion ActionMode not showing on RTL languages
When long pressing on an empty Text field with the system language set
to RTL, the "paste" popup was not showing up.

The Floating Toolbar requires a content rect to determine where the
text is and place itself close to it. In the case of an empty field,
we create a "fake" content rect by taking the placement of the cursor
+1 pixel to the right. In RTL languages, this +1 causes the content
rect to be considered off the bounds of the view, as the cursor is
aligned to the right, and hence the Floating Toolbar is hidden.

After making the rect a 0 width rect, we ran into the issue that
it was considered out of bounds due to the calculation ignoring rects
that simply touch the edge of the view's bounds.

BUG: 22540083
Change-Id: I29c79b701f586970b2611178233eff082b802ec1
2015-08-12 21:03:28 +01:00
Adrian Roos
44a80e2013 am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev
* commit 'c0a4883d58554c84d10911da20f43be149b47c53':
  Prevent overlap of color views in landscape
2015-08-12 18:14:06 +00:00
Adrian Roos
fe836fabd9 Prevent overlap of color views in landscape
Removes overlap from the color views which resulted in subotimal looks
when both color views were translucent and the nav bar was on the right
edge.

Also fixes a bug introduced in I2df7092a91eceeb815367ef917dd7289f4f2b27e
where the navigation-bar-on-right-side case got forgotten and caused
flickering in landscape when IMMERSIVE_STICKY was set but the navigation bar
was visible.

Bug: 22876533
Change-Id: I449a82eb3dc3f7b5051f26b37b362a196b4ff63a
2015-08-11 17:36:43 -07:00
Chris Wren
816f07bce0 am 93f3fc87: Merge "add metrics to assistant" into mnc-dev
* commit '93f3fc876639cd23ff176cba2e1f8f08df6f3fb5':
  add metrics to assistant
2015-08-06 19:25:28 +00:00
Chris Wren
a35c96eb90 add metrics to assistant
long press
  screenshot enabled
  context enabled

Bug: 22949579
Change-Id: Iac178207fa7149cda03c9a817a0d1450e46e1c59
2015-08-06 15:11:42 -04:00
Mitchell Wills
701a36d594 am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev
* commit 'bce3eb22afcd57b7f1bdde26030f8c44bb885a4b':
  Fix incorrect default wifi power draw values
2015-08-05 17:09:00 +00:00
Mitchell Wills
bce3eb22af Merge "Fix incorrect default wifi power draw values" into mnc-dev 2015-08-05 16:59:23 +00:00
Mitchell Wills
bb4fd9009e am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit '385dfd349ff773c499859ee44552995e9c25759c':
  Charge apps for wifi tx time while scanning
2015-08-04 22:01:35 +00:00
Mitchell Wills
385dfd349f Merge "Charge apps for wifi tx time while scanning" into mnc-dev 2015-08-04 21:55:46 +00:00
Mitchell Wills
f901649bd9 Charge apps for wifi tx time while scanning
Bug: 22955562
Change-Id: Ie2c6ab65e7b592272e1cad120ac606fcfd6ea677
2015-08-04 14:47:01 -07:00
Mitchell Wills
083e1d9e4b Fix incorrect default wifi power draw values
Bug: 22848679
Change-Id: Ief4e3e05b051b93efbe30fdc8903cce6765d2ed8
2015-08-04 10:28:16 -07:00
Adam Lesinski
e8585a23de am 59d72c86: Merge "BatteryStats: Add debug logging to find source of b/22716723" into mnc-dev
* commit '59d72c86269f4d0c914c233d16a9bf00f0440df8':
  BatteryStats: Add debug logging to find source of b/22716723
2015-08-04 03:10:51 +00:00
Adam Lesinski
fbabe7dd6a BatteryStats: Add debug logging to find source of b/22716723
Bug:22716723
Change-Id: I97b940b702666b393555622d034e1c694b1e346a
2015-08-03 15:45:13 -07:00
Alan Viverette
5be6cc6db9 am ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit 'ef3f58e59ba44b2679e98ccb46d588eba2c99cac':
  Make ResolverDrawerLayout look like a ScrollView to accessibility
2015-08-03 20:28:59 +00:00
Alan Viverette
7b77b284de am e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit 'e76bf46ab9d59592a06fbb3fcff826a50d548b9f':
  Add badge content description to TargetInfo, use in ResolverActivity
2015-08-03 20:28:51 +00:00
Alan Viverette
ef3f58e59b Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev 2015-08-03 20:17:57 +00:00
Alan Viverette
e76bf46ab9 Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev 2015-08-03 20:17:31 +00:00
Alan Viverette
1ff29f2d56 Make ResolverDrawerLayout look like a ScrollView to accessibility
Disable accessibility focus on the layout itself and expose the class
name as ScrollView so that we can get auto-scroll working until we have
first-class support for specifying automatic scrolling behavior.

Bug: 22667764
Change-Id: I9b97e40f16038046898e5b56b935a61db9073ac6
2015-08-03 10:01:23 -04:00
Svetoslav Ganov
52f805e4b1 am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev
* commit '8dbd48485044b1ab25fb8fb5e8e9b9772a3478c4':
  Add per UID control to app ops.
2015-08-01 02:37:32 +00:00
Svetoslav Ganov
8dbd484850 Merge "Add per UID control to app ops." into mnc-dev 2015-08-01 02:28:02 +00:00
Svet Ganov
2af5708ab0 Add per UID control to app ops.
The app ops mananger service maintains a mapping from UID to
a list of packages where each package is mapped to a list of
non-default app op states (default states are inferred and
not stored). Hence, specifying the app op state for a UID
requires setting the app op for each package in the shared
UID.

This is problematic when installing new packages if there
is a non-default app op policy set for another already
installed package in the same UID as the app op for the new
package has to be updated to be in sync. The package installer
cannot do this as it is in another process and the app op
update will not be atomic. Therefore, the app ops manager
service has to support specifying app op policy on a per
UID basis.

We now have a UID state object that contains the per package
non-default app op states as well as the per uid non-default
app op states. If there is a UID policy specified then it
takes precedence over the per package one. Even further,
changing the uid policy updates the package policies in this
UID if the state is non-default. Changing a package app op
state also updates the app op state for the whole UID if
the per UID policy for this op is non-default. Clearing the
app op state for a package, clears the policy for the UID
as well.

bug:22802981

Change-Id: I78044906d9fcc6066abf07e706c2c88f3397d293
2015-07-31 17:45:27 -07:00
Yusuke Sato
c2369c5301 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
2015-07-31 23:34:06 +00:00
Alan Viverette
ce5d92c313 Add badge content description to TargetInfo, use in ResolverActivity
Bug: 22667344
Change-Id: Iee241b9179c74a15b1c635cf90d2f96f6f7b31cd
2015-07-31 16:46:56 -04:00
Dianne Hackborn
f2269f0454 Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-31 17:19:03 +00:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Yusuke Sato
705ffd1efe Distinguish user-requested shutdown from power-related ones
With this patch, when the user requested shutdown,
PowerManagerService sets sys.powerctl is set to
"shutdown,userrequested", and init runs fsck on shutdown.

When shutdown is triggered due to a low power state etc.,
the service sets the property to "shutdown,", and init
immediately shuts down the system without running the
command.

This is a follow-up CL for http://r.android.com/158525.

Bug: 21853106
Change-Id: Iae72990130fe9aa479c802f77301438190dbbfb3
2015-07-30 23:47:13 -07:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
Adrian Roos
7840685465 am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit 'e2cd84196e1266200f906b5d721640217fc2e6f9':
  Fix pattern lock for accessibility
2015-07-29 21:37:08 +00:00
Adrian Roos
e2cd84196e Merge "Fix pattern lock for accessibility" into mnc-dev 2015-07-29 21:23:25 +00:00
Adrian Roos
d2def94639 Fix pattern lock for accessibility
- remove the content description in Keyguard
- only show virtual views when pattern is in progress
- add a content description when the pattern is not in progress

Bug: 22646748
Change-Id: Id32a37c4c74c82b547cee8861b2856fa0a08c41c
2015-07-29 14:13:53 -07:00
Chris Wren
2eeb47c6a1 am 1bd310e1: Merge "import more metrics enums" into mnc-dev
* commit '1bd310e18c50d4fd81207a3e2fe61cc694ee7607':
  import more metrics enums
2015-07-29 15:18:33 +00:00