drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,841 Commits 1 Branch 0 Tags
Commit Graph

1532 Commits

Author SHA1 Message Date
The Android Open Source Project
dbccd44a63 Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD 
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
 2013-11-22 11:18:57 -08:00
Elliott Hughes
8f592378a1 am 69920427: Merge "Fix a variety of small publicly-reported bugs." 
* commit '69920427ea01421d34f3a7576bdd135527b20859':
  Fix a variety of small publicly-reported bugs.
 2013-10-29 13:32:33 -07:00
Elliott Hughes
c367d48c55 Fix a variety of small publicly-reported bugs. 
Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp.
https://code.google.com/p/android/issues/detail?id=61556

Missing fclose in core/jni/android_os_Debug.cpp.
https://code.google.com/p/android/issues/detail?id=61546

Bad loop guards in core/jni/android_util_Process.cpp.
https://code.google.com/p/android/issues/detail?id=61557

Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Leaks on error in tools/aapt/Images.cpp.
https://code.google.com/p/android/issues/detail?id=61552

Two missing fclose calls in tools/aapt/Resource.cpp.
https://code.google.com/p/android/issues/detail?id=61553

Missing fclose in tools/aidl/aidl.cpp.
https://code.google.com/p/android/issues/detail?id=61554

Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
 2013-10-29 13:12:55 -07:00
Alan Viverette
e4ccb864e8 am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 
* commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb':
  Ignore certain WindowManager flags when touch exploration is enabled
 2013-10-07 17:54:42 -07:00
Alan Viverette
6930d3805e Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 2013-10-08 00:47:23 +00:00
Adam Lesinski
f2163cb0d1 am ea4e0751: am c884fc9f: Merge "AAPT emits error for res with no \'default\' product" into klp-dev 
* commit 'ea4e07518cd1844b1654175ef27cf9501e0dd7eb':
  AAPT emits error for res with no 'default' product
 2013-10-07 16:02:13 -07:00
Alan Viverette
5a0f4eccfb Ignore certain WindowManager flags when touch exploration is enabled 
Specifically, ignore any flags that alter the visibility of the navigation
bar and transparency.

BUG: 11082573
Change-Id: I17264dc55a1c6c3cb9b9cf92d5121799cecee5b8
 2013-10-07 15:12:57 -07:00
Adam Lesinski
2b8e82fd51 AAPT emits error for res with no 'default' product 
Rather than ignoring resources that do not match the specified
product, we keep track of the ignored ones and make sure that
some variant of the resource that matches the product was processed.

bug:10860838
Change-Id: I804cd04a053269a35b7e1c1cc743b77493337bf9
 2013-10-04 15:14:09 -07:00
Marco Nelissen
2c64e2be0c am 70cd6886: am fb45a2e9: Merge "Fix layoutlib build" into klp-dev 
* commit '70cd68869d04b56883a8d2fa34f0468d730f227d':
  Fix layoutlib build
 2013-10-03 15:41:48 -07:00
John Reck
35f2dcd02c am cdc605c6: am b885435c: Merge "Update liblayout" into klp-dev 
* commit 'cdc605c69597649c8e71161791ae64be48ce1f11':
  Update liblayout
 2013-10-03 15:38:50 -07:00
Marco Nelissen
fb45a2e9cd Merge "Fix layoutlib build" into klp-dev 2013-10-03 20:51:36 +00:00
Marco Nelissen
7e6f2ee4d2 Fix layoutlib build 
Change-Id: Ica9f506ae06311d9bcd98bc11e64a8699d4f88cb
 2013-10-03 13:40:46 -07:00
John Reck
5623d5f80f Update liblayout 
Fix build

Change-Id: I6c9223205874f7709fcf9e69a7779c54f52ba48b
 2013-10-02 18:59:10 -07:00
Jim Miller
a192253bf2 am fb2e3c8d: Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev 
* commit 'fb2e3c8d47c162166a029a97d68ad3bedff89cce':
  Fix permissions on WindowManagerService.showAssistant()
 2013-09-30 17:10:11 -07:00
Adam Lesinski
4056c94adf am 0c923b7c: Merge "Add badging of Payment apps" into klp-dev 
* commit '0c923b7ce1f4e40b401bcd342f4ee4399f4ad9d7':
  Add badging of Payment apps
 2013-09-30 17:09:58 -07:00
Adam Lesinski
db239f91d6 am 5223a5ff: Merge "Add support for dumping new badging" into klp-dev 
* commit '5223a5ff24bed6d0a0ac618083a3ed050bdd98b2':
  Add support for dumping new badging
 2013-09-30 17:09:54 -07:00
Jim Miller
fb2e3c8d47 Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev 2013-09-28 01:18:17 +00:00
Jim Miller
6c9df5054a Fix permissions on WindowManagerService.showAssistant() 
Since binder call permissions are not transitive by design,
the proper way to fix this is to have the call talk directly
to keyguard from the navigation bar.

Fixes bug 9409008

Change-Id: Ibd90a79bb638c969b514455a2ad93c6ff668222d
 2013-09-27 16:29:36 -07:00
Adam Lesinski
d831e80a2f Add badging of Payment apps 
HCE apps that declare themselves as payment apps will receive
that badge when running aapt dump badging.

bug:10899864
Change-Id: I7c095214412465ad7a925285d6167e12de16b600
 2013-09-27 11:22:46 -07:00
Adam Lesinski
b1249b822c Add support for dumping new badging 
APKs with AccessibilityServices, PrintServices, and or DeviceAdmin
will have those services dumped when running 'aapt dump badging'.

bug:10899864
Change-Id: I9c1f1f36c397b128dca802510368573a54977459
 2013-09-27 11:10:37 -07:00
Deepanshu Gupta
68862f07b6 am 79a1a7c3: am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '79a1a7c367214e86d1ea18fe07bc4d2d5bc00f76':
  Fix ClassCastException when rendering ListView
 2013-09-13 17:14:48 -07:00
Deepanshu Gupta
79a1a7c367 am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '31207780338b97e396927701ca0da7a61d6d44b2':
  Fix ClassCastException when rendering ListView
 2013-09-13 15:01:00 -07:00
Deepanshu Gupta
3120778033 am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '0ecfe3819269062805c4c56cdc1470c2fc3856c8':
  Fix ClassCastException when rendering ListView
 2013-09-13 14:57:35 -07:00
Jonathan Dixon
42513ca1a6 am caee47f0: Merge "Preparation for deleting WebViewClassic" into klp-dev 
* commit 'caee47f096403068f02c41a91f8dad1aa5d13169':
  Preparation for deleting WebViewClassic
 2013-09-11 11:05:42 -07:00
Jonathan Dixon
caee47f096 Merge "Preparation for deleting WebViewClassic" into klp-dev 2013-09-11 17:59:42 +00:00
Dianne Hackborn
03422d2626 am e9aad4ae: Merge "Fix issue #10688644: Java crash in com.android.phone:" into klp-dev 
* commit 'e9aad4ae31caeb00f95d83119c2020f4cb5f345c':
  Fix issue #10688644: Java crash in com.android.phone:
 2013-09-11 10:49:10 -07:00
Dianne Hackborn
95d785346b Fix issue #10688644: Java crash in com.android.phone: 
java.lang.SecurityException: Operation not allowed

There was a situation I wasn't taking into account -- components
declared by the system has a special ability to run in the processes
of other uids.  This means that if that code loaded into another
process tries to do anything needing an app op verification, it will
fail, because it will say it is calling as the system package name but
it is not actually coming from the system uid.

To fix this, we add a new Context.getOpPackageName() to go along-side
getBasePackageName().  This is a special call for use by all app ops
verification, which will be initialized with either the base package
name, the actual package name, or now the default package name of the
process if we are creating a context for system code being loaded into
a non-system process.

I had to update all of the code doing app ops checks to switch to this
method to get the calling package name.

Also improve the security exception throw to have a more descriptive
error message.

Change-Id: Ic04f77b3938585b02fccabbc12d2f0dc62b9ef25
 2013-09-11 09:59:47 -07:00
Deepanshu Gupta
54d88f7678 Fix ClassCastException when rendering ListView 
Bug: b.android.com/59300
Change-Id: Ia350adb3308daa8170bff755302760790163c811
 2013-09-10 18:38:41 -07:00
Deepanshu Gupta
d7cdc16827 am a7127540: Merge "Add isPremultiplied option to Bitmap_Delegate in LayoutLib" into klp-dev 
* commit 'a71275401143bc259fd5804ab6852fc3265d88b7':
  Add isPremultiplied option to Bitmap_Delegate in LayoutLib
 2013-09-09 12:40:27 -07:00
Deepanshu Gupta
a712754011 Merge "Add isPremultiplied option to Bitmap_Delegate in LayoutLib" into klp-dev 2013-09-09 19:35:03 +00:00
Dianne Hackborn
d4ff4b649e am e6a01f37: Merge "Fix build." into klp-dev 
* commit 'e6a01f37934340c9fce9dcd8ee98b02d9d635af6':
  Fix build.
 2013-09-08 13:14:56 -07:00
Dianne Hackborn
01f8c0e277 Fix build. 
Change-Id: Ifeac5d09a654ee1183ae26519c8b44f560afd636
 2013-09-08 13:07:32 -07:00
Michael Wright
f17e8ee379 am 86974463: Merge "Added support for supports-input manifest element" into klp-dev 
* commit '86974463e9e28108e14fa255efd3c429358c0605':
  Added support for supports-input manifest element
 2013-09-05 18:31:04 -07:00
Michael Wright
eaeb190486 Added support for supports-input manifest element 
Change-Id: Ifa7c87908081585c1940b5a47fdf5138a287d9ea
 2013-09-05 18:15:57 -07:00
Deepanshu Gupta
e68c111e38 am 0851945a: am b50de495: am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev 
* commit '0851945a72e10e1d31aafa459f7e69cdf7087bee':
  Fix text rendering
 2013-09-05 12:03:20 -07:00
Deepanshu Gupta
a9f35ab904 am b6545562: am 97c88368: am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 
* commit 'b654556213513885ff5be05d4d2808e34d50233e':
  Fix layout rendering for RTL locales
 2013-09-05 12:03:17 -07:00
Deepanshu Gupta
0851945a72 am b50de495: am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev 
* commit 'b50de4951aaea6d6f01432dc17b7c5de778a2e71':
  Fix text rendering
 2013-09-05 12:00:58 -07:00
Deepanshu Gupta
b654556213 am 97c88368: am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 
* commit '97c88368e0036665507c8cd84c71d26953784c85':
  Fix layout rendering for RTL locales
 2013-09-05 12:00:54 -07:00
Deepanshu Gupta
b50de4951a am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev 
* commit 'dd4efc22c736973ecfa1b7b4af9e71f971dd48b3':
  Fix text rendering
 2013-09-05 11:58:59 -07:00
Deepanshu Gupta
97c88368e0 am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 
* commit 'c78d173b730dcfdf107e6ac2bc959d459fe3eedd':
  Fix layout rendering for RTL locales
 2013-09-05 11:58:54 -07:00
Deepanshu Gupta
0d9c922c96 Fix text rendering 
There are still some errors
1. Little vertical clippping for extra tall glyphs.
2. Breaking into scripts isn't perfect which results in incorrect layout
of text.

Change-Id: I54de3c05eca5e8affb1135c120eea24c3afe8a47
 2013-09-05 10:58:10 -07:00
Deepanshu Gupta
490efa8bc4 Add isPremultiplied option to Bitmap_Delegate in LayoutLib 
Change-Id: Id06921d8db2fe898fdc60ef9d05d05f8dfe3f94a
 2013-09-04 18:38:46 -07:00
Chet Haase
09ed072028 am 49ee555f: Merge "Transition API changes from API council recommendations" into klp-dev 
* commit '49ee555f239c79871b661e5ff135061f26665e1c':
  Transition API changes from API council recommendations
 2013-09-04 16:49:39 -07:00
Chet Haase
d82c8ac4db Transition API changes from API council recommendations 
Issue #10460684 KLP API Review: android.view.transition and android.animation
Issue #10570740 Transitions: inflate transition targets from xml

Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
 2013-09-04 14:46:38 -07:00
Deepanshu Gupta
88db0ee2af Fix layout rendering for RTL locales 
This changeset adds the framework resources for RTL locales and mirrors
the layout if the application is RTL aware.

Use ICU to check the character orientation of the locale - right to left
or left to right. Set the layout direction on the top level layout
accordingly. Also, load the RTL resources for Nav Bar when the locale is
RTL.

Change-Id: I1ed0d516ab64120a0abca413ba678036661508f8
 2013-09-04 14:23:53 -07:00
Victoria Lease
c27bc4fbb2 am adae1e91: am 1b8c33c6: Merge "Forward compatibility fixes" 
* commit 'adae1e91de4b2be7a67a33e8f3c3161f5cec15e1':
  Forward compatibility fixes
 2013-08-27 09:57:26 -07:00
Victoria Lease
adae1e91de am 1b8c33c6: Merge "Forward compatibility fixes" 
* commit '1b8c33c614a1a67fadf3f32758ac781e05dcb8aa':
  Forward compatibility fixes
 2013-08-27 09:55:11 -07:00
John Reck
e982b7231f Forward compatibility fixes 
Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8
 2013-08-26 16:53:40 -07:00
Ying Wang
d3373c292a Merge "Better aidl generated dependency" into klp-dev 2013-08-26 19:18:35 +00:00
Jonathan Dixon
22e90cf2b0 Preparation for deleting WebViewClassic 
Bug: 10427705

- layoutlib has references to classes that no longer build into the host
  core JAR when WebViewClassic is removed.
- preloaded-classes should not reference WebViewClassic classes.

Change-Id: I4d6773a88ea2932982278127a3c96d38be54ddf5
 2013-08-25 23:02:37 -07:00