Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,665 Commits 3 Branches 0 Tags
5fc4e443510fb5f612ebd022810efb85fa114838
Commit Graph

25484 Commits

Author SHA1 Message Date
Eric Laurent
5fc4e44351 am 4bbcc654: Display a fixed volume silder when docked. 
* commit '4bbcc6549738f3d69831b2bd9eb4accec3e9920e':
  Display a fixed volume silder when docked.
 2012-09-25 12:49:03 -07:00
Jean-Baptiste Queru
6d5efebc56 am 5ef9cb68: Merge into jb-mr1-dev 
* commit '5ef9cb68c3bb639990abc0eadcaaaa61164ad628':
  Hiding a method for JB-MR1
 2012-09-25 12:48:55 -07:00
Romain Guy
0708f52740 am ed1b6f4f: Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919 
* commit 'ed1b6f4fc0af836624b2edc2830eb918bf04cf3c':
  Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-25 12:48:40 -07:00
Romain Guy
6f62e86dd8 am c002936e: Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919 
* commit 'c002936e4bd042db3024202b3e9696835a730cfa':
  Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-25 12:48:33 -07:00
Jean-Baptiste Queru
74b11cbff0 am 7951c459: Merge into jb-mr1-dev 
* commit '7951c459aefeb012638477b762e19b792ecbe009':
  AppInfo from Notifications for secondary users
 2012-09-25 12:47:49 -07:00
Jean-Baptiste Queru
b7e4bbbed6 am a5e1d21f: Merge into jb-mr1-dev 
* commit 'a5e1d21f566c8df750d766c76f6a99432a703c5e':
  Move multi-user OBB under user-specific path.
 2012-09-25 12:47:37 -07:00
Jean-Baptiste Queru
507cb6e231 am ec199613: Merge into jb-mr1-dev 
* commit 'ec1996131d2e17408a22fd55fbc3edba5ea80d02':
  Fix surface view on secondary display.
  Fix drag and drop surfaces on secondary displays.
  Allow a window on a secondary display to have focus.
 2012-09-25 12:47:27 -07:00
Jean-Baptiste Queru
185c3a700d am 7a7c6aa0: Merge into jb-mr1-dev 
* commit '7a7c6aa0c35d80145e163d9e637180d3be127441':
  Force activities to run on the second display for testing.
 2012-09-25 12:47:17 -07:00
Martijn Coenen
87f22278c3 am f8538594: Fix build. 
* commit 'f8538594fe6ba6db3310da042597840601d78cda':
  Fix build.
 2012-09-25 12:47:00 -07:00
Jean-Baptiste Queru
3d9e6909fd am 1b242759: Merge into jb-mr1-dev 
* commit '1b242759763205fa529591738cbe213fcc25150e':
  Adding support for new 'uid2445' column in Calendar's Events table.
 2012-09-25 12:46:53 -07:00
Jean-Baptiste Queru
5170ae12c3 am 0de06b7e: Merge into jb-mr1-dev 
* commit '0de06b7e19e4c6329cc966198d249d12c2b19d40':
  TaskStackBuilder and intents without an explicit target
 2012-09-25 12:46:46 -07:00
Jean-Baptiste Queru
908fae38fe am c68accd3: Merge into jb-mr1-dev 
* commit 'c68accd35e9ee0a49172ef144664f0fe9187ccd7':
  Add extra error check when eglCreateContext fails Bug #7216919
 2012-09-25 12:46:43 -07:00
Jean-Baptiste Queru
89ee9b26ab am 93fd0f7a: Merge into jb-mr1-dev 
* commit '93fd0f7a83f61d4d673b73e002bd9ad7d6ce562b':
  Camera: Improve enableShutterSound documentation.
 2012-09-25 12:46:35 -07:00
Jean-Baptiste Queru
df3131e466 am 6fb2514c: Merge into jb-mr1-dev 
* commit '6fb2514cdf77e2657d7b73b0cd97e060aefc6b53':
  Fix issue #7215984: java.lang.RuntimeException: Unable to create...
 2012-09-25 12:46:26 -07:00
Martijn Coenen
8aad9d7923 am 8f862ef9: Add NfcBarcode technology API. 
* commit '8f862ef9f74f2d2ebf767c645ce39db8412dd08f':
  Add NfcBarcode technology API.
 2012-09-25 12:46:22 -07:00
Eric Laurent
4bbcc65497 Display a fixed volume silder when docked. 
Align UI indication to volume policy when docked: the music volume
cannot be adjusted when docked or connected to HDMI. Display
a disabled slider at max volume in this case to be consistent.

Bug 4335692.

Change-Id: I6f8db143b0e2ecf54e4bdacd88afdeb661a98a18
 2012-09-25 10:28:05 -07:00
Jean-Baptiste Queru
5ef9cb68c3 Merge into jb-mr1-dev 
Change-Id: I4696f4336d79ca199f2358bfb3ed5fc7e6c51732
 2012-09-25 09:46:23 -07:00
Romain Guy
ed1b6f4fc0 Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext 
Bug #7216919

Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
 2012-09-25 09:44:35 -07:00
Romain Guy
c002936e4b Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext 
Bug #7216919

Change-Id: If2059227d55e8ddb2d2673ee36029c3c92dd9a3d
 2012-09-25 09:43:23 -07:00
Jean-Baptiste Queru
7951c459ae Merge into jb-mr1-dev 
Change-Id: Ifc2328e30a52c2baebc1322c9b161104dcf21618
 2012-09-25 09:36:32 -07:00
Jean-Baptiste Queru
a5e1d21f56 Merge into jb-mr1-dev 
Change-Id: I22fd779623397332e493f71ac718b972e1e1dad7
 2012-09-25 09:35:53 -07:00
Jean-Baptiste Queru
ec1996131d Merge into jb-mr1-dev 
Change-Id: I97ff2551b36a1b590f2d314cabfcf198dd10f404
 2012-09-25 09:35:19 -07:00
Jean-Baptiste Queru
7a7c6aa0c3 Merge into jb-mr1-dev 
Change-Id: I821410e9ffcc7148139465c04ef335f0becc18c2
 2012-09-25 09:34:45 -07:00
Martijn Coenen
f8538594fe Fix build. 
Bug: 7222958
Change-Id: I2f9ff988f09be6cd4be49bfb90750a46e63c2c14
 2012-09-25 09:31:50 -07:00
Jean-Baptiste Queru
1b24275976 Merge into jb-mr1-dev 
Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5
 2012-09-25 09:31:15 -07:00
Jean-Baptiste Queru
0de06b7e19 Merge into jb-mr1-dev 
Change-Id: I02a0c4a7c8f66c52631f962e097c28f6a41d7a64
 2012-09-25 09:29:18 -07:00
Jean-Baptiste Queru
c68accd35e Merge into jb-mr1-dev 
Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae
 2012-09-25 09:28:32 -07:00
Jean-Baptiste Queru
93fd0f7a83 Merge into jb-mr1-dev 
Change-Id: I6bfc2726c0c259eeb3caf13e1cee395324cac4c3
 2012-09-25 09:27:02 -07:00
Jean-Baptiste Queru
6fb2514cdf Merge into jb-mr1-dev 
Change-Id: I1baab28b12364213673ed7992207ad198491f286
 2012-09-25 09:25:15 -07:00
Martijn Coenen
8f862ef9f7 Add NfcBarcode technology API. 
Supporting only Kovio barcode technology for now.

Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
 2012-09-25 09:22:16 -07:00
Amith Yamasani
ea7e91514e AppInfo from Notifications for secondary users 
Required wiring up startActivitiesAsUser()

Bug: 7224950

Also fix a bug in navigateUp in secondary user

Change-Id: I114ae2de0457362d62e899fdb94b12239a3eb778
 2012-09-24 17:19:03 -07:00
Kristian Monsen
d0b90d30d8 Hiding a method for JB-MR1 
This one got left out in the last round of method hiding.

This got lost in the last round of method hiding.

Change-Id: I3c6aa234dd29933cb32d0cd91830d47289e7e639
 2012-09-24 19:11:30 -04:00
Romain Guy
4c7dc4aa5c Add extra error check when eglCreateContext fails 
Bug #7216919

Change-Id: I322cbe4579d7a4eb2a64d288175e145d0badc857
 2012-09-24 15:35:33 -07:00
Jeff Brown
8d0243a3d0 Fix surface view on secondary display. 
Bug: 7183618
Change-Id: I8d743b5db8f362afb97f720846d990f9a722b3bd
 2012-09-24 15:02:15 -07:00
Jeff Brown
efd43bdb83 Force activities to run on the second display for testing. 
This is a simple hack for testing and development purposes.
It makes the framework place the main window of an activity
on to a secondary display instead of on the default display.

Set the "debug.second-display.pkg" to a substring of the
package name of the activity that you want to have show
up on the secondary display, such as "com.example.android.apis"

Bug: 7183618
Change-Id: I0a9e7f27c8ff253253b9de57d4bc49f31d95a0e2
 2012-09-24 14:37:25 -07:00
Adam Powell
9ceac5a02f TaskStackBuilder and intents without an explicit target 
When Activity#getParentActivityIntent() returns an Intent without an
explicit target, resolve it in order to determine a correct parent
stack.

Bug 7223318

Change-Id: I3e88129f1e538cc3d932d6b4f735a5bec54bb4ad
 2012-09-24 14:28:44 -07:00
Dianne Hackborn
139748fd72 Fix issue #7215984: java.lang.RuntimeException: Unable to create... 
...service com.android.systemui.SystemUIService: java.lang.NullPointerException

- Don't acquire the activity manager lock in handleIncomingUser(),
  there is really no need to do so.
- Rework the settings provider client side cache code to not hold
  locks while calling into the provider.

I also changed the way the settings provider uses system properties
so that there is one property for all users.  We can't do one per
user, since the system property name space is limited with a fixed
size.  And we don't really need to do that; the worse that happens
by combining all users is that if one running user changes one of its
settings, all other running users will think they need to reload
settings when they go to fetch them next.

Change-Id: I13b90b832310d117eb6d721aacd122cfba7d749a
 2012-09-24 14:15:14 -07:00
Sara Ting
4d6f90ea50 Adding support for new 'uid2445' column in Calendar's Events table. 
Bug:7029852
Change-Id: I4fdf86ba44f5c7bdcc55e8c2bdf664dddbe671f5
 2012-09-24 13:09:35 -07:00
Jeff Sharkey
7d8bcb498d Move multi-user OBB under user-specific path. 
Bug: 7212801
Change-Id: I0ab83c1d9cb21914d61a7da45a32e89956e22ec8
 2012-09-24 13:03:35 -07:00
Eino-Ville Talvala
487acdfb4e Camera: Improve enableShutterSound documentation. 
Bug: 7216272
Change-Id: I1b9add715c7d3671472b9f98d9b1d80823109365
 2012-09-24 12:22:16 -07:00
Philip Milne
0014c0f64a 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:42 -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
Philip Milne
53fe756772 Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" 
This reverts commit 2f6d882952

Change-Id: Id5af767a09fc319127c4ebef837c5b7a7f75cb01
 2012-09-24 11:38:29 -07:00
Dianne Hackborn
308ac6c6e4 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:08:46 -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
2eba91d98f 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:19 -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
dae9f15389 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:57 -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