Commit Graph

4285 Commits

Author SHA1 Message Date
Adam Lesinski
b0767441fc Merge "Revert "AAPT: Allow duplicate attribute definitions if identical"" into nyc-dev
am: 913a2fdb06

* commit '913a2fdb064c479dd5d7c4e47a0844bdd5895414':
  Revert "AAPT: Allow duplicate attribute definitions if identical"
2016-02-25 23:19:22 +00:00
Adam Lesinski
913a2fdb06 Merge "Revert "AAPT: Allow duplicate attribute definitions if identical"" into nyc-dev 2016-02-25 23:13:24 +00:00
Adam Lesinski
525db2489d Revert "AAPT: Allow duplicate attribute definitions if identical"
This reverts commit c25283b5e2.

Change-Id: I2f42a4360fa53c4333494afe0178dcec56d62d8e
2016-02-25 23:13:08 +00:00
Adam Lesinski
3e5a512248 Merge "AAPT: Allow duplicate attribute definitions if identical" into nyc-dev
am: ddbad32341

* commit 'ddbad32341c9dab0bdec11aee88c68a48ec5cd22':
  AAPT: Allow duplicate attribute definitions if identical
2016-02-25 21:07:19 +00:00
Adam Lesinski
ddbad32341 Merge "AAPT: Allow duplicate attribute definitions if identical" into nyc-dev 2016-02-25 21:00:22 +00:00
Todd Kennedy
acbcf9d9ab Merge "Revert "Remove deprecated methods / classes"" into nyc-dev
am: fe01ea05dd

* commit 'fe01ea05dd196acaf95a61e169f6b75654ae0875':
  Revert "Remove deprecated methods / classes"
2016-02-24 22:54:13 +00:00
Todd Kennedy
fe01ea05dd Merge "Revert "Remove deprecated methods / classes"" into nyc-dev 2016-02-24 22:45:50 +00:00
Todd Kennedy
5cbeb59026 Revert "Remove deprecated methods / classes"
This reverts commit 9706c01f9b.

Change-Id: I14c53ab140220e48f6728b1173ea58760bbeb7f9
2016-02-24 22:45:00 +00:00
Todd Kennedy
07e794ad14 Merge "Remove deprecated methods / classes" into nyc-dev
am: ca67844e0c

* commit 'ca67844e0c6b564970b8d329009c0d110888a3fc':
  Remove deprecated methods / classes
2016-02-24 21:11:47 +00:00
Todd Kennedy
ca67844e0c Merge "Remove deprecated methods / classes" into nyc-dev 2016-02-24 21:02:58 +00:00
Jorim Jaggi
3902aac928 Fix build
am: c87e2b46fb

* commit 'c87e2b46fb949f1ba5d72b842bad443b36fd9abc':
  Fix build
2016-02-24 18:54:36 +00:00
Jorim Jaggi
c87e2b46fb Fix build
Change-Id: Id21200a8239908c18379d67639c090ccfd3772f2
2016-02-24 18:48:42 +00:00
Diego Perez
4fd156d24d Merge "Fix FontFamily nAddFontWeightStyle in nyc" into nyc-dev
am: f19e782233

* commit 'f19e782233c4135097f12e7f770ba041718078d7':
  Fix FontFamily nAddFontWeightStyle in nyc
2016-02-24 11:52:04 +00:00
Diego Perez
7eeacc27e3 Fix FontFamily nAddFontWeightStyle in nyc
Change-Id: I156812384c758edbd6efa23fd18a0ce7b9b82993
2016-02-23 12:20:11 +00:00
Andreas Gampe
ad8c87f247 Merge "Preload2: Fix object to sync on" am: de38445284
am: dcb4956ad1

* commit 'dcb4956ad18350428e72d152efc2dc84c16b5f8d':
  Preload2: Fix object to sync on
2016-02-23 01:38:40 +00:00
Yohei Yukawa
5cf733f89b Fix build breakage.
This follows up to my previous CL [1], which forgot to update
BridgeIInputMethodManager.java (again!).

  [1] I56934f18e30d90fcdf77bcbb0c35a92a5feb1b82
      05c25f8a3a

Bug: 25373872
Change-Id: I0643069fd0b677115c89c340b7a23f1d12bd7988
2016-02-22 15:11:49 -08:00
Andreas Gampe
dcb4956ad1 Merge "Preload2: Fix object to sync on"
am: de38445284

* commit 'de384452846c1f84ce9d88b470f0ca5129446055':
  Preload2: Fix object to sync on
2016-02-22 18:11:00 +00:00
Adam Lesinski
c25283b5e2 AAPT: Allow duplicate attribute definitions if identical
This allows libraries to coexist a bit easier, since a lot of them
declare the same attribute. When used together they cause errors.
Bug:27101533

Change-Id: I10327251636392e810637a79e7c9aa514f3f07a6
2016-02-22 09:25:06 -08:00
Diego Perez
26b2754310 Remove layoutlib RunQueue implementation
Change-Id: Id2b666f086a48f101ff7ef4177fe28ad17d10783
2016-02-22 17:16:50 +00:00
Diego Perez
18780f60ef DO NOT MERGE: Fix Canvas memory leak
am: b75a0426d8

* commit 'b75a0426d8c2339f2d552f96cc4dfcd86deb3447':
  DO NOT MERGE: Fix Canvas memory leak
2016-02-22 16:19:12 +00:00
Diego Perez
f5650cf3a3 Fix Canvas memory leak
Every RenderSession would call the AttachInfo.setAttachInfo but wouldn't
issue a View.dispatchDetachedFromWindow.
This caused some Canvas to be slowly leaked in the DelegateManager in
every session.

Change-Id: Iec418a86f5c5e55c2a2860ef945268c51c0e8173
2016-02-22 15:01:30 +00:00
Diego Perez
b75a0426d8 DO NOT MERGE: Fix Canvas memory leak
Every RenderSession would call the AttachInfo.setAttachInfo but wouldn't
issue a View.dispatchDetachedFromWindow.
This caused some Canvas to be slowly leaked in the DelegateManager in
every session.

Change-Id: Ib0392303e6d00a4fe5494ae484f28135b1fe6b28
2016-02-22 14:09:09 +00:00
Diego Perez
4f2103631a Merge "Revert "Fix Canvas memory leak"" into mnc-ub-dev
am: 44f92b00d1

* commit '44f92b00d1a060773625de5884fc86e7218e2dd5':
  Revert "Fix Canvas memory leak"
2016-02-19 20:18:28 +00:00
Diego Perez
44f92b00d1 Merge "Revert "Fix Canvas memory leak"" into mnc-ub-dev 2016-02-19 20:09:09 +00:00
Diego Perez
cf93572889 Revert "Fix Canvas memory leak"
This reverts commit e82bd72b6e.

Change-Id: Ie9ef25b17d5f725d5054c039992a8cd2912868a6
2016-02-19 20:07:44 +00:00
Diego Perez
1d3c41e563 Merge "Fix Canvas memory leak" into mnc-ub-dev
am: bad0e07ee9

* commit 'bad0e07ee9163d6b0f0bf73ad591ff6e453199ef':
  Fix Canvas memory leak
2016-02-19 18:08:00 +00:00
Diego Perez
bad0e07ee9 Merge "Fix Canvas memory leak" into mnc-ub-dev 2016-02-19 17:58:17 +00:00
Diego Perez
e82bd72b6e Fix Canvas memory leak
Every RenderSession would call the AttachInfo.setAttachInfo but wouldn't
issue a View.dispatchDetachedFromWindow.
This caused some Canvas to be slowly leaked in the DelegateManager in
every session.

Change-Id: I0322767e5fffc6053ce1be852dd8ca904dfaa137
2016-02-19 17:57:36 +00:00
Andreas Gampe
f2a9933fa7 Preload2: Fix object to sync on
When moving to sync on the right objects, these waits() have been
forgotten.

Change-Id: I61b0d3c5cc41b7f46fbdd3099ec44221e653001a
2016-02-19 09:24:43 -08:00
Neil Fuller
6b6d8426fe Fix a bad merge
There was a bad interaction between
commits 6777f54fa4
and 23e47f5621.

Change-Id: Ic408f8b4859d83d89c612748ee6e772b57830d96
2016-02-19 16:50:14 +00:00
Jeff Sharkey
003ee19851 Merge "Make BackupManager encryption aware." into nyc-dev 2016-02-18 19:26:36 +00:00
Diego Perez
16e17a7730 resolve merge conflicts of aa9c9fb29e to nyc-dev
Change-Id: Id46238cb759f2d63a072cb7ea8a27c5fd8a6672e
2016-02-18 18:28:50 +00:00
Jeff Sharkey
2c1ba9a961 Make BackupManager encryption aware.
Backup requires both CE and DE storage to be available, so delay
spinning up the backup system until the user is unlocked, since
that's when CE storage becomes available.  Note that devices without
FBE immediately transition USER_SYSTEM into the unlocked state,
since their CE is always available.

Offer to backup and restore files under both CE and DE.  Since DE
is effectively the same as CE, most logic is simply duplicated for
now, but it could be simplified in the future.  Since system apps
can force their default storage location to DE, we always build
explicit CE and DE paths.

Add getDataDir() to give clean access to the top-level private data
directory, but disclaim that apps shouldn't create files there.

Bug: 26279618
Change-Id: Ic34a4b330223725db93b1d0f5c9dffc88002c61f
2016-02-18 10:54:11 -07:00
Deepanshu Gupta
3b6ea2e3a8 Entry -> Map.Entry. Fixes build break
Change-Id: I72fe70d6f617c7753a278e134ac22d71125d8def
2016-02-17 20:51:08 -08:00
Deepanshu Gupta
7914e4ca03 Switch LayoutLib to Java 8
The main build hasn't swtiched to java 8, but lambdas are already used
in layoutlib. This fixes the build break.

Change-Id: I4dd69ebd736179067899f5d86d3608d5fdb03d93
2016-02-17 20:50:00 -08:00
Deepanshu Gupta
f0c5b7af6f Merge "LayoutLib fixes for N" into nyc-dev 2016-02-18 03:04:16 +00:00
Adam Lesinski
3581fbc8ad Merge "AAPT2: Implement density stripping and initial Split support" into nyc-dev 2016-02-18 02:32:33 +00:00
Adam Lesinski
355f285ffd AAPT2: Implement density stripping and initial Split support
When a preferred density is supplied, the closest matching densities
will be selected, the rest stripped from the APK.

Split support will be enabled in a later CL. Command line support is still
needed, but the foundation is ready.

Bug:25958912
Change-Id: I56d599806b4ec4ffa24e17aad48d47130ca05c08
2016-02-17 18:17:25 -08:00
Deepanshu Gupta
491523d52c LayoutLib fixes for N
Moves LayoutLib to Java 8 - YAY!
Fix delegates

Change-Id: I098996e43e330e995d33f12df1c16355bbc02f0f
2016-02-18 02:10:24 +00:00
Bill Yi
2528fcdfbd Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD
Change-Id: Ifc45930160cf01ee78ecfbfdc48697055f82e0a7
2016-02-17 11:38:55 -08:00
Diego Perez
aa9c9fb29e Replace SimpleDateFormat implementation
This will process all the classes and replace all the uses of
java.text.DateFormat and java.text.SimpleDateFormat with the
android.icu.text. package implementations. The original ones do not
match the Android platform behaviour.

Change-Id: Id55f103c21117a8d6403bf2124b6c1a0e1fb2f71
2016-02-17 18:54:17 +00:00
Andrei Stingaceanu
eb84b1843a Suspend packages - one call for multiple packages
Refactor setPackageSuspended into setPackagesSuspended. The rationale
is that the consumers of this API are likely to want to remove
multiple packages at once. Rather than calling the API N times, call
it just once.

The good part is that we already have the broadcast intent for
suspended packages take an array so only one broadcast. Less stress
on the system.

Another good part is that (right now) we only have one consumer of
this API and it will be easy to make changes once this CL goes in.

As a shell command, for consistency only allowed one package at
a time.

Bug: 22776761
Change-Id: Ic8b8cf64d0a288ea3a282bb7b72f9d663b3b0049
2016-02-17 15:14:33 +00:00
Andrei Stingaceanu
5ae4e73ef0 Merge "Suspend packages - new API for retrieving the suspended status" into nyc-dev 2016-02-17 11:57:51 +00:00
Todd Kennedy
9706c01f9b Remove deprecated methods / classes
Now that we've moved the majority of system components to the
PackageInstaller, we can remove the majority of the "installPackage"
methods and the VerificationParams/ContainerEncryptionParams
classes. There are still some lingering references to the two
installPackage() methods left [both internal and external; play
is using these methods via reflection].

Bug: 24542768
Change-Id: Ib65323d842d9f0e7fed60e37e6b5f103c94c859b
2016-02-16 13:39:55 -08:00
Andrei Stingaceanu
355b232d79 Suspend packages - new API for retrieving the suspended status
Instead of always rebuilding the full ApplicationInfo for a
package when callers are only interested in the suspended status
add a new fast API in Packagemanager (which only checks the
suspended user setting for the requested package and returns
a boolean) and change the appropriate caller code too.

Bug: 26794775
Bug: 22776761
Change-Id: Ide8428ef734479360d5a8a75fd8e0ed8ddf2da7a
2016-02-16 14:57:29 +00:00
Jeff Sharkey
115d2c189a Add feature versions for devices and apps.
We're starting to see more instances of device features that will
increment separately from the SDK API level, such as camera HAL,
GPU capabilities, Bluetooth, and other hardware standards.

This change adds the ability for device features to specify a
version, which is defined to be backwards compatible.  That is, apps
requesting an older version of a feature must continue working on
devices with a newer version of that same feature.

When a version is undefined, we assume the default version "0".

Bug: 27162500
Change-Id: If890bf3f3dbb715e8feb80e7059a0d65618482ea
2016-02-15 17:45:42 -07:00
Adam Lesinski
5f7c461be6 AAPT2: Fix source output when error occurs in style
We were serializing the wrong Source when writing to protobuf

Change-Id: Ib65e962ebc1244ddf4af0e5666aaaebe5f7864a8
2016-02-12 23:38:08 -08:00
Adam Lesinski
923e6342fb Merge "AAPT2: Introduce notion of 'product' to ResourceTable" into nyc-dev 2016-02-13 06:28:06 +00:00
Adam Lesinski
e4bb9eb5af AAPT2: Introduce notion of 'product' to ResourceTable
This allows us to preserve the various product definitions during the compile
phase, and allows us to select the product in the link phase.

This allows compiled files to remain product-independent, so that they do not need
to be recompiled when switching targets.

Bug:25958912
Change-Id: Iaa7eed25c834b67a39cdc9be43613e8b5ab6cdd7
2016-02-12 22:21:48 -08:00
Vladislav Kaznacheev
989b58a633 Update pointer icon when View.setPointerIcon is called
Currently the updated pointer icon is only displayed after
the next mouse move.

Bug:27107871
Change-Id: Ieed57b07fe44699735179cf57968a9bb08981396
2016-02-12 16:55:53 -08:00