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

126029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Salyzyn
9ca25502c0 am 48250e14: am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" 
* commit '48250e141dc738578f6957f86ac841f3cb522057':
  androidfw: resolve 64-bit build issues
 2014-03-19 19:52:02 +00:00
Glenn Kasten
6afcecdc15 am 2fb4a6bb: am 48988921: am d6408735: Merge "PacProcessor should be 32 bit only." 
* commit '2fb4a6bb9eee5e99fee4fae2949f48e839d749d7':
  PacProcessor should be 32 bit only.
 2014-03-19 19:47:57 +00:00
Mark Salyzyn
48250e141d am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" 
* commit '9a09a5236529962afbaba9893e5eaf72bd6621b4':
  androidfw: resolve 64-bit build issues
 2014-03-19 19:47:02 +00:00
Jeff Sharkey
1be762c1ba Define an OEM directory, scan features and APKs. 
To support OEM customizations, define a new top-level directory
that roughly mirrors the layout of the system partition.  Scan this
location for (non-privileged) apps, and for additional features.

Bug: 13340779
Change-Id: Idb6d6626655061ee31ad952cab734d30ea6130b9
 2014-03-19 12:44:48 -07:00
Glenn Kasten
2fb4a6bb9e am 48988921: am d6408735: Merge "PacProcessor should be 32 bit only." 
* commit '4898892118c00b3de7a9713d38b32c3dcaf00c91':
  PacProcessor should be 32 bit only.
 2014-03-19 19:42:43 +00:00
Mark Salyzyn
9a09a52365 am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" 
* commit '0b472ae13d38dd166a1a35782e028ade85bf2975':
  androidfw: resolve 64-bit build issues
 2014-03-19 12:42:15 -07:00
Robert Greenwalt
1b98e90db0 resolved conflicts for merge of 0bff77d6 to master 
Change-Id: Ia4c86126079740978658a05579b56d59d41a7b01
 2014-03-19 12:41:54 -07:00
Glenn Kasten
4898892118 am d6408735: Merge "PacProcessor should be 32 bit only." 
* commit 'd6408735b9b2ca9378886a4b30e3d691c0923817':
  PacProcessor should be 32 bit only.
 2014-03-19 12:38:41 -07:00
Mark Salyzyn
0b472ae13d Merge "androidfw: resolve 64-bit build issues" 2014-03-19 19:36:52 +00:00
Glenn Kasten
d6408735b9 Merge "PacProcessor should be 32 bit only." 2014-03-19 19:34:08 +00:00
John Spurlock
1af30c7ac4 Add stream-level suppression to vibrate/audio services. 
- Add new audio restriction layer to app-ops.  Restrictions add
additional constraints to audio operations at a stream-level.
Restrictions do not affect the persistable state, and are purely
additive: that is, they can only impose additional contstraints, not
enable something that has already been disabled.  Restrictions
also support a whitelisted set of exempt package names.

- Add new audio stream-level checks to app-ops.

- Implement a provisional OP_PLAY_AUDIO suppression to three
java entry points MediaPlayer, AudioTrack, & SoundPool.

- Enhance vibrator api to take stream information as an optional
hint - the constants correspond to AudioManager stream types.
OP_VIBRATE now supports the stream-level restriction check.

- Simplify Vibrator subclasses by adding default implementations
for two .vibrate calls.

- Migrate NoMan's zen-mode control to use the new app-ops
stream-level restriction mechanism.

Change-Id: Ifae8952647202f728cf1c73e881452660c704678
 2014-03-19 15:32:51 -04:00
Michael Wright
e5659baa4f Use DisplayPowerRequest#wantLightSensorEnabled in ABC. 
Change-Id: I2cb869a40ed91331a55972d0ea557269733d5204
 2014-03-19 12:25:20 -07:00
Robert Greenwalt
0bff77d6f3 am 45b1e5ec: am 42b746e4: am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit '45b1e5ec053eecc4e00246eac5c4137a2aba12e0':
  Handle provisioning APN by turning off/on data.
 2014-03-19 19:17:56 +00:00
Dan Sandler
86f55d5ead am 6f132587: am e47c5a3c: am 48b3f56c: Merge commit \'95a7829c\' into manualmerge 
* commit '6f132587a801b4b305ab1eeb47ab4ceeb5a89bf0':
  DO NOT MERGE: Maintain binding to crashed listeners.
 2014-03-19 19:17:41 +00:00
Robert Greenwalt
45b1e5ec05 am 42b746e4: am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit '42b746e4d8baa6141598ddaae7148baea2ddf366':
  Handle provisioning APN by turning off/on data.
 2014-03-19 19:13:00 +00:00
Dan Sandler
6f132587a8 am e47c5a3c: am 48b3f56c: Merge commit \'95a7829c\' into manualmerge 
* commit 'e47c5a3c13a4624b10e1d3b4be0fd10f1146c942':
  DO NOT MERGE: Maintain binding to crashed listeners.
 2014-03-19 19:12:52 +00:00
Robert Greenwalt
42b746e4d8 am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit 'bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
  Handle provisioning APN by turning off/on data.
 2014-03-19 19:08:44 +00:00
Dan Sandler
e47c5a3c13 am 48b3f56c: Merge commit \'95a7829c\' into manualmerge 
* commit '48b3f56cd8a3597e6ecfc5ad55d20eca182a6852':
  DO NOT MERGE: Maintain binding to crashed listeners.
 2014-03-19 19:07:41 +00:00
Lajos Molnar
0cab07d788 MediaPlayer: fix int overflow issue in MediaTimeProvider 
Bug: 13394783
Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
 2014-03-19 11:35:17 -07:00
Mark Salyzyn
00adb8685e androidfw: resolve 64-bit build issues 
- uid_t/gid_t cast to unsigned long
- unused argument warnings
- tab and space requirements

Change-Id: Ib446d8165b9082be02edb55e6b71fd1a03ea3431
 2014-03-19 11:11:14 -07:00
Michael Jurka
929e75e8d0 [DO NOT MERGE] Centering the crop by default in system wallpaper cropper 
Bug: 12034934

Change-Id: Ice1b1140bd6e351dd4e520f555f245d84a645aac
(cherry picked from commit 2ab14daebac46307d2364733481edc3115bbf98c)
 2014-03-19 17:57:17 +00:00
Michael Jurka
c82618c660 [DO NOT MERGE] Fix wallpaper cropping bugs 
- take into account that image decoder might not
respect inSampleSize
- check rounded values so we don't have crop rects
that lie outside a bitmap's dimensions
- correctly set initial scale on bitmaps that are
larger than the screen size
- switch to using asynctask when setting wallpaper
dimensions
(cherry picked from commit e39c9a953ca11319b747b3aa79f4ccd082b775b7)

Change-Id: I43372f0bff37f139c8bc83f9956a967d0b4a8708
 2014-03-19 17:56:55 +00:00
Narayan Kamath
587a25b6cd mediaeditor shouldn't depend on audioflinger. 
Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90
 2014-03-19 17:49:47 +00:00
Robert Craig
4385343fd8 Allow PMS to restorecon directories under /data. 
This change applies a relabel to both /data/data and
/data/user directories on boot. Not every boot will
apply this relabeling however. The appropriate
seapp_contexts is hashed and compared to
/data/system/seapp_hash to decide if the relabel
should occur.

Change-Id: I05e8b438950ddb908e46c9168ea6ee601e6d674f
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-03-19 17:37:37 +00:00
Baligh Uddin
f1bf634804 Import translations. DO NOT MERGE 
Change-Id: Iecc45fe69925b925ccae978a5848b082896db62c
Auto-generated-cl: translation import
 2014-03-19 10:29:37 -07:00
Baligh Uddin
2b2eadd0f8 Import translations. DO NOT MERGE 
Change-Id: Ic7a9bdd8f8da2462638e3abf361ef938d1fb2a9e
Auto-generated-cl: translation import
 2014-03-19 10:24:06 -07:00
Baligh Uddin
aa6f9d94a8 Import translations. DO NOT MERGE 
Change-Id: I2e61beac4aa1eb5e5adac7d71653e4d6308cd937
Auto-generated-cl: translation import
 2014-03-19 10:22:41 -07:00
Baligh Uddin
09598b7d7e Import translations. DO NOT MERGE 
Change-Id: I31228b3aa6e9e8e79c283c3de3ae0709c3226dc4
Auto-generated-cl: translation import
 2014-03-19 10:18:46 -07:00
Narayan Kamath
78c0ce5612 Fix 64 bit compile failures in renderscript 
Use uintptr_t for pointers (and not uint32_t) and
also don't assume that size_t is 32 bits wide.

Also uses java longs for passing pointers across
JNI boundaries.

Change-Id: Ie52bd8ae967fbddc911eda3a43cc799d53bbce66
 2014-03-19 17:14:54 +00:00
Baligh Uddin
7cf3e334be Import translations. DO NOT MERGE 
Change-Id: I2a993d03ba28b42348c201919c4d1ab6bae23445
Auto-generated-cl: translation import
 2014-03-19 09:48:18 -07:00
Baligh Uddin
3042c1d148 Import translations. DO NOT MERGE 
Change-Id: I0c7513f5c141219c6d763119142eea562ce9be39
Auto-generated-cl: translation import
 2014-03-19 09:42:07 -07:00
Baligh Uddin
8b6d9fee1f Import translations. DO NOT MERGE 
Change-Id: Ic4396a06837a9e5c6f32ec9237567f886bdae8bd
Auto-generated-cl: translation import
 2014-03-19 09:41:29 -07:00
Robert Greenwalt
bd84f01c6c am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit '5d3d4ee3005e910dce780074d3f68d594aa12070':
  Handle provisioning APN by turning off/on data.
 2014-03-19 16:15:22 +00:00
Robert Greenwalt
5d3d4ee300 Merge "Handle provisioning APN by turning off/on data." into klp-dev 2014-03-19 16:12:01 +00:00
Dan Sandler
48b3f56cd8 Merge commit '95a7829c' into manualmerge 2014-03-19 12:02:51 -04:00
George Mount
31dc8f701f Merge "Fix ActionBar layout bug when INVISIBLE." 2014-03-19 14:25:23 +00:00
Narayan Kamath
f83c73ec2f Don't register methods when there's nothing to register. 
Change-Id: I6d0233f79bb90089426d702b4076ec5750e82475
 2014-03-19 14:13:27 +00:00
Dan Sandler
95a7829c27 am b78dc69c: Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev 
* commit 'b78dc69c2be43852dcd7150db2b545f9b4110232':
  DO NOT MERGE: Maintain binding to crashed listeners.
 2014-03-19 13:08:53 +00:00
Dan Sandler
b78dc69c2b Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev 2014-03-19 13:04:01 +00:00
Narayan Kamath
58f9a645e1 PacProcessor should be 32 bit only. 
It depends on external/v8, which isn't ready for 64 bit yet.

Change-Id: Ibc9705665b81d3667826dedd6217f2eb6d451c81
 2014-03-19 11:39:43 +00:00
Wei Wang
f305589f22 Add status callback for start/stop advertising. 
Fixes b/13289050, b/13418851, also fixes 13418671.

Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77
 2014-03-18 19:33:16 -07:00
Zhijun He
555084b3a5 Merge "Camera2: Update exposureTimeRange related docs" 2014-03-19 02:12:08 +00:00
Dave Platt
87c20886dc am eac88aae: am 28e9f76d: am c76bccd6: am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev 
* commit 'eac88aae957c72e02ea9f2747ffc290829bcacb1':
  Harden NsdManager against null-dereference crashes
 2014-03-19 01:30:23 +00:00
Dave Platt
eac88aae95 am 28e9f76d: am c76bccd6: am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev 
* commit '28e9f76dcefb53a493fed74b0ccaac650755f069':
  Harden NsdManager against null-dereference crashes
 2014-03-19 01:12:52 +00:00
Jeff Brown
beb2fc9b71 am f9c69fc8: am 322dc212: am 1eac8391: am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 
* commit 'f9c69fc8b809b295540ea737d194b061159a500b':
  Refresh cast icon assets to improve visual contrast.
 2014-03-19 01:11:02 +00:00
Dave Platt
28e9f76dce am c76bccd6: am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev 
* commit 'c76bccd6ea993eb6e71baff9f5ed2f9fe67af947':
  Harden NsdManager against null-dereference crashes
 2014-03-19 01:07:46 +00:00
Jeff Brown
f9c69fc8b8 am 322dc212: am 1eac8391: am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 
* commit '322dc212b7d725889b239ed829ac3b2d75a0df72':
  Refresh cast icon assets to improve visual contrast.
 2014-03-19 01:04:55 +00:00
Jeff Brown
322dc212b7 am 1eac8391: am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 
* commit '1eac839165b05d4998ca344a25594b0a1cfae042':
  Refresh cast icon assets to improve visual contrast.
 2014-03-19 01:00:06 +00:00
Dave Platt
c76bccd6ea am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev 
* commit '17e7c4076b8f1617ed397dae570e9d5240cd9c1b':
  Harden NsdManager against null-dereference crashes
 2014-03-19 00:59:47 +00:00
Jeff Brown
aba566589e Fix inverted conditional in View.setFilterTouchesWhenObscured. 
Bug: 13530806
Change-Id: Icdaf909c355f5b22635e1060f2190502916b144f
 2014-03-18 17:59:21 -07:00