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

88023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siva Velusamy
d119210086 am c60b87a5: am a850f9a1: Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev 
* commit 'c60b87a54a2f50f8132b3760449590d4e699dca4':
  Do not preload videoeditor_jni since it breaks the emulator
 2012-09-24 12:51:49 -07:00
Siva Velusamy
c60b87a54a am a850f9a1: Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev 
* commit 'a850f9a168e79aa247f7bb39f4f43a4c4b0cff79':
  Do not preload videoeditor_jni since it breaks the emulator
 2012-09-24 12:49:24 -07:00
Siva Velusamy
a850f9a168 Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev 2012-09-24 12:46:15 -07:00
Doug Zongker
5bcb55186e fix argument parser for global settings URLs 
Make content://settings/global/setting_name URLs work like system and
secure URLs.

Bug: 7212535
Change-Id: I33e388a0cc80309453714eab726ce45b3f8fef73
 2012-09-24 12:24:54 -07:00
Eino-Ville Talvala
487acdfb4e Camera: Improve enableShutterSound documentation. 
Bug: 7216272
Change-Id: I1b9add715c7d3671472b9f98d9b1d80823109365
 2012-09-24 12:22:16 -07:00
Romain Guy
87e2f757be Add a property to disable libhwui's scissor optimization 
Bug #7158326

When scissor optimization is enabled, OpenGLRenderer will attempt to
minimize the use of scissor by selectively enabling and disabling the
GL scissor test.
When the optimization is disabled, OpenGLRenderer will keep the GL
scissor test enabled and change the scissor rect as needed.
Some GPUs (for instance the SGX 540) perform better when changing
the scissor rect often than when enabling/disabling the scissor test
often.

Change-Id: Idb68862e287a23358f9188d577ae0f86161902fd
 2012-09-24 11:47:52 -07:00
Philip Milne
4bd62e7c9f am ee1d3f39: am bc391d58: Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev 
* commit 'ee1d3f39b1d58f034f29da4518e88fc4fa06daff':
  Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"
 2012-09-24 11:45:55 -07:00
Philip Milne
ee1d3f39b1 am bc391d58: Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev 
* commit 'bc391d58c8d09bd58b57dda20dd9d2281d90db32':
  Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"
 2012-09-24 11:43:36 -07:00
Philip Milne
bc391d58c8 Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev 2012-09-24 11:41:53 -07:00
Ben Murdoch
4b36f6d180 Expose resources needed by Chromium-WebView. 
This is the first set of framework resources that we've encountered
during the Chromium-WebView bring up that need to be exposed, so add
them to symbols.xml. There will likely be more to come as we continue
bring up work.

Bug: 7178701
Change-Id: I12571e5385bfc13213d2e3c7dfabfdc904c8fe84
 2012-09-24 19:40:35 +01:00
Philip Milne
53fe756772 Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" 
This reverts commit 2f6d8829524dfca3a77e9a57c3b9c3862209877d

Change-Id: Id5af767a09fc319127c4ebef837c5b7a7f75cb01
 2012-09-24 11:38:29 -07:00
Michael Jurka
2f4c3db95d am d65fc7f8: am 9b93f4de: Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-dev 
* commit 'd65fc7f851baa870fa1f42bde2d30ef19843388f':
  Fix security check for private allocateAppWidgetId api
 2012-09-24 11:30:26 -07:00
Michael Jurka
d65fc7f851 am 9b93f4de: Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-dev 
* commit '9b93f4def131845200997c861858f34cc15c8dee':
  Fix security check for private allocateAppWidgetId api
 2012-09-24 11:27:50 -07:00
Michael Jurka
9b93f4def1 Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-dev 2012-09-24 11:24:26 -07:00
Dianne Hackborn
50f3b3f4bb am 3aa28c0d: am 7451f15e: Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev 
* commit '3aa28c0dbc356839ce9d37b8ddc6b446387dc790':
  Fix issue #6926562: Ensure all multi-user cache files are managed correctly
 2012-09-24 11:11:54 -07:00
Dianne Hackborn
3aa28c0dbc am 7451f15e: Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev 
* commit '7451f15e7464fe8dd117b74c6dcff780785e0007':
  Fix issue #6926562: Ensure all multi-user cache files are managed correctly
 2012-09-24 11:09:26 -07:00
Philip Milne
a18db1bb4e am 846527d7: am b00df8e9: Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 
* commit '846527d74c8f9b75bbc6d21f99ba83126305ddff':
  Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
 2012-09-24 11:07:42 -07:00
Dianne Hackborn
7451f15e74 Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev 2012-09-24 11:07:26 -07:00
Philip Milne
846527d74c am b00df8e9: Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 
* commit 'b00df8e929f9ba865a95a7df3f949e6169332954':
  Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
 2012-09-24 11:05:11 -07:00
Dianne Hackborn
d6a2666a39 am 1f7a6220: am cd11b223: Merge "Fix issue #7214090: Need to be able to post notifications to all users" into jb-mr1-dev 
* commit '1f7a6220c0935f10f2aab6d297ca033b36a33503':
  Fix issue #7214090: Need to be able to post notifications to all users
 2012-09-24 11:03:24 -07:00
Dianne Hackborn
556b09e184 Fix issue #6926562: Ensure all multi-user cache files are managed correctly 
Now we correctly iterate through the different user cache dirs.

Also update documentation to describe the new cache pruning behavior,
and deprecate the file modes for making files world readable/writable
which we really don't want people using any more.

Change-Id: I3708df3ddc697b1f5c511143cce7cc40a5a3d0bd
 2012-09-24 11:02:45 -07:00
Philip Milne
b00df8e929 Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 2012-09-24 11:02:31 -07:00
Dianne Hackborn
1f7a6220c0 am cd11b223: Merge "Fix issue #7214090: Need to be able to post notifications to all users" into jb-mr1-dev 
* commit 'cd11b223f3d23ca0f92b53808f7e1cce928c2a7b':
  Fix issue #7214090: Need to be able to post notifications to all users
 2012-09-24 11:00:53 -07:00
Dianne Hackborn
cd11b223f3 Merge "Fix issue #7214090: Need to be able to post notifications to all users" into jb-mr1-dev 2012-09-24 10:58:20 -07:00
Dianne Hackborn
50cdf7c306 Fix issue #7214090: Need to be able to post notifications to all users 
Also fix a bunch of system services that should be doing this.  And
while doing that, found I needed to fix PendingIntent to evaluate
USER_CURRENT at the point of sending, not creation.

Note that this may end up with us having some notification shown to
non-primary users that lead to settings UI that should only be for
the primary user (such as the vpn notification).  I'm not sure what
to do about this, maybe we need a different UI to come up there or
something, but showing the actual notification for those users at
least seems less broken than not telling them at all.

Change-Id: Iffc51e2d7c847e3d05064d292ab93937646a1ab7
 2012-09-24 10:55:46 -07:00
Siva Velusamy
c0373dfdc1 Do not preload videoeditor_jni since it breaks the emulator 
Video editing is not supported on the emulator, so preloading
this causes the emulator to crash while booting up.

Bug 7200384

Change-Id: I1915d888be328c20aa66ca2318722d5b6e6342b0
 2012-09-24 10:34:42 -07:00
Robert Greenwalt
2b24e06a06 am 940eb097: am d5111f25: Merge "Fix the build." into jb-mr1-dev 
* commit '940eb097278ae70c721a347dc5eee8e34fdbf191':
  Fix the build.
 2012-09-24 10:21:29 -07:00
Robert Greenwalt
940eb09727 am d5111f25: Merge "Fix the build." into jb-mr1-dev 
* commit 'd5111f252b731396293caedbee929856acd6b276':
  Fix the build.
 2012-09-24 10:16:40 -07:00
The Android Open Source Project
cdc46670ee am fbba193d: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'fbba193d3841b14bcfce02cdb9dd4715eb7dea39':
  Disable content observer cross-user permission checks...
  Disable content observer cross-user permission checks...
  Fix deadlock in LockPatternUtils by using local id.
  Compute GradientDrawable's opacity correctly
  Tweaking how settings adds keyguard widgets
  Settings provider needs to send notifications as itself
  Visualizer only works on sounds >5 sec.
  dodging the @JavascriptInterface bullet
  Fix crash in recents
  Wait for installd to finish starting before booting.
  Temporarily turn off package verification
 2012-09-24 10:14:52 -07:00
Robert Greenwalt
d5111f252b Merge "Fix the build." into jb-mr1-dev 2012-09-24 10:13:57 -07:00
The Android Open Source Project
fbba193d38 Reconcile with jb-mr1-release - do not merge 
Change-Id: I37715a9d2489d282d09a60cf32d92f13c3d82b13
 2012-09-24 10:12:10 -07:00
Robert Greenwalt
026efcc0b8 Fix the build. 
Other side of change 229425: add the secure settings used to control
the source country used in premium-sms determination.

bug:7205426
Change-Id: I6c8fece4fdea9aeae72da70c5cbe45807197c7bc
 2012-09-24 10:03:21 -07:00
Alon Albert
f528e56de0 am 4f895c81: am fcf0061e: Merge "Skip operations for users who are not running" into jb-mr1-dev 
* commit '4f895c8143eef5e6bdc1f3a74c74b09bc1437a14':
  Skip operations for users who are not running
 2012-09-24 09:58:12 -07:00
Alon Albert
4f895c8143 am fcf0061e: Merge "Skip operations for users who are not running" into jb-mr1-dev 
* commit 'fcf0061ebf2a56f76f207460b39fb14f25779bfd':
  Skip operations for users who are not running
 2012-09-24 09:56:00 -07:00
Alon Albert
d5aa6bd073 am d1631f76: am 0ff65375: Merge "Add columns to CalendarContract" into jb-mr1-dev 
* commit 'd1631f76b8e4797957cb85f4a8ce9926dd2c163b':
  Add columns to CalendarContract
 2012-09-24 09:54:16 -07:00
Alon Albert
fcf0061ebf Merge "Skip operations for users who are not running" into jb-mr1-dev 2012-09-24 09:53:33 -07:00
Alon Albert
d1631f76b8 am 0ff65375: Merge "Add columns to CalendarContract" into jb-mr1-dev 
* commit '0ff65375683f5d5f05c7e1882f758cc93be57c99':
  Add columns to CalendarContract
 2012-09-24 09:51:02 -07:00
Amith Yamasani
1294230aa3 am ffdb4fb3: am 888eb73c: resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
* commit 'ffdb4fb3f8eeac789a57d5b16dfb667ddb9ad21a':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 09:50:31 -07:00
Victoria Lease
089818fe14 am 5d0f02d9: am 8658e1aa: Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 
* commit '5d0f02d90cba9920b40159c56d85dbeed6862ddc':
  Allow apps to getProviders() without location permissions.
 2012-09-24 09:50:25 -07:00
Amith Yamasani
ffdb4fb3f8 am 888eb73c: resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
* commit '888eb73c6e86a18520cbaa999a18e8b039dbed4f':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 09:47:00 -07:00
Alon Albert
0ff6537568 Merge "Add columns to CalendarContract" into jb-mr1-dev 2012-09-24 09:46:59 -07:00
Victoria Lease
5d0f02d90c am 8658e1aa: Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 
* commit '8658e1aa1fb0905852c4b0f5ae1d96cd2d56b6cf':
  Allow apps to getProviders() without location permissions.
 2012-09-24 09:46:53 -07:00
The Android Open Source Project
5f25993020 am f959ad7f: (-s ours) am 18fd992b: am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'f959ad7f0d9eaeff01702e8f443074c99378e92d':
  Show plmn in emergency call allowed mode.
  Get your own cursor Drawables, WebViewClassic!
 2012-09-24 09:39:41 -07:00
Kenny Root
fd896079ea am e748729b: am c6f8a998: Merge "LockScreen: don\'t update KeyStore password on unlock" into jb-mr1-dev 
* commit 'e748729b82bf287e153c40eab019e2c6bca33a3b':
  LockScreen: don't update KeyStore password on unlock
 2012-09-24 09:39:37 -07:00
John Spurlock
892c2278c6 am 0c8dfe34: am 2ce1ae8e: Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev 
* commit '0c8dfe3486f5650cd7969ff6cbb52fd1cd716be4':
  Migrate away from lightsOut() in BeanBagDream.
 2012-09-24 09:39:34 -07:00
Jim Miller
fa3b11643b am fc74a44f: am 26c5686b: Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev 
* commit 'fc74a44f3e2df846fb009fe326809ed76537265b':
  Better handling of multiple touch events in GlowPadView
 2012-09-24 09:39:30 -07:00
Jeff Sharkey
dab41705e0 am 17505666: am 49397ac9: Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 
* commit '175056661d1ec5219a6aec157544e510b9a47203':
  Always bind to DefaultContainerService as OWNER.
 2012-09-24 09:39:26 -07:00
Romain Guy
08d6526a5e am fff1e8af: am 6b3292ce: Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-dev 
* commit 'fff1e8afba582cb97eeca75c6c1368ee74588891':
  Avoid deadlock when deleting layers Bug #7217459
 2012-09-24 09:39:23 -07:00
Irfan Sheriff
87151b7009 am 55f133fa: am 916b2b5a: Merge "Increase WFD connect time out to 60s" into jb-mr1-dev 
* commit '55f133fafb0fb239759262d2c61fb0b58ae4dab4':
  Increase WFD connect time out to 60s
 2012-09-24 09:39:19 -07:00
Fabrice Di Meglio
793d9abb89 am c86c9fc0: am f7a3e979: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'c86c9fc092280cb961bf46e87050da9c46836278':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:39:15 -07:00