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

87271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhihai Xu
8bd9e0cdc1 am 03a896b6: am 77f6677b: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev 
* commit '03a896b6d8971e54a72e90d9373d162f6a4d8f40':
  ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
 2012-09-20 20:27:42 -07:00
Baligh Uddin
4db5dbc25e am 9c0da59f: (-s ours) am 2f98008d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9c0da59fa98371f1edd3c42ced167ae8e133597f':
  Import translations. DO NOT MERGE
 2012-09-20 20:27:39 -07:00
Christopher Tate
61b03a04ee am 820c12c1: am 58e7f73c: Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev 
* commit '820c12c1cb6e6f275fb6beb0706d8ac3abe38f5f':
  Multiuser awareness in content observer infrastructure
 2012-09-20 20:27:35 -07:00
Zhihai Xu
03a896b6d8 am 77f6677b: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev 
* commit '77f6677bcddad7c626ef5432eead4031c24f4685':
  ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
 2012-09-20 20:23:11 -07:00
Baligh Uddin
9c0da59fa9 am 2f98008d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2f98008d06cbe48f0f5619d16f59988952c9b2ca':
  Import translations. DO NOT MERGE
 2012-09-20 20:22:27 -07:00
Christopher Tate
820c12c1cb am 58e7f73c: Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev 
* commit '58e7f73c6e2d6583be0beabc95e7ac430bef0eb4':
  Multiuser awareness in content observer infrastructure
 2012-09-20 20:22:21 -07:00
Zhihai Xu
77f6677bcd Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev 2012-09-20 16:41:02 -07:00
Baligh Uddin
1fc38919c1 Merge "Import translations. DO NOT MERGE" 2012-09-20 16:01:24 -07:00
Baligh Uddin
2f98008d06 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-20 15:55:06 -07:00
Baligh Uddin
b62ef8e998 Import translations. DO NOT MERGE 
Change-Id: I2cb1338cac6a48403ff169e3c99a3ad8b2a93b35
Auto-generated-cl: translation import
 2012-09-20 15:54:25 -07:00
Tsu Chiang Chuang
8e306a8707 am 40e80c63: am 6cc5d7fc: Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev 
* commit '40e80c6345f03379c1443f70c31b1a97d0000f8a':
  fix broken user build: do not throw an error when in user flavor.
 2012-09-20 15:46:50 -07:00
Baligh Uddin
416f6ec572 Import translations. DO NOT MERGE 
Change-Id: I454f0cd3a9289b271206d7eeec89773c66ec199b
Auto-generated-cl: translation import
 2012-09-20 15:46:33 -07:00
Tsu Chiang Chuang
ca12b812d2 am af2c015f: am c1ec220c: Merge "Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode." into jb-mr1-dev 
* commit 'af2c015f2c2288c0c31e517f4f19a1df35c649a0':
  Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode.
 2012-09-20 15:46:32 -07:00
Dianne Hackborn
febd9cb1af am b79d01ed: am 6de76d21: Merge "Implement multi-user PackageMonitor." into jb-mr1-dev 
* commit 'b79d01edb29f1d047ce9adb3e1b90c308ddcb47c':
  Implement multi-user PackageMonitor.
 2012-09-20 15:46:29 -07:00
Dianne Hackborn
53cfedca95 am f8171e22: am e6f63800: Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev 
* commit 'f8171e229bb3036e762bc8545c99e31e1cbfef3b':
  Fix issue #7196015: system_server deadlock during setup wizard
 2012-09-20 15:46:17 -07:00
Christopher Tate
58e7f73c6e Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev 2012-09-20 15:43:57 -07:00
Tsu Chiang Chuang
40e80c6345 am 6cc5d7fc: Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev 
* commit '6cc5d7fc0b23305fb7a3216b814d96d1ebab76d7':
  fix broken user build: do not throw an error when in user flavor.
 2012-09-20 15:37:26 -07:00
Tsu Chiang Chuang
6cc5d7fc0b Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev 2012-09-20 15:35:00 -07:00
Tsu Chiang Chuang
0cfb73de1c fix broken user build: do not throw an error when in user flavor. 
Change-Id: I43d210f1b342707acbdb79f9ef6c924b43684dd3
 2012-09-20 15:27:23 -07:00
Tsu Chiang Chuang
af2c015f2c am c1ec220c: Merge "Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode." into jb-mr1-dev 
* commit 'c1ec220c4b3f518d74be91b7a69fb42af6642ad1':
  Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode.
 2012-09-20 15:06:56 -07:00
Tsu Chiang Chuang
c1ec220c4b Merge "Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode." into jb-mr1-dev 2012-09-20 15:04:10 -07:00
Tsu Chiang Chuang
35fae68cc3 Change the way how airplane mode is set, since it has been moved to 
Settings.Global namespace. Also run as a system app, since only system
apps can change airplane mode.

Change-Id: I317f9c94361cfca182356fd292e5b0b41553d1ab
 2012-09-20 14:58:48 -07:00
Dianne Hackborn
b79d01edb2 am 6de76d21: Merge "Implement multi-user PackageMonitor." into jb-mr1-dev 
* commit '6de76d21ff60818f8b296fc8f645897203f475da':
  Implement multi-user PackageMonitor.
 2012-09-20 14:56:54 -07:00
Dianne Hackborn
6de76d21ff Merge "Implement multi-user PackageMonitor." into jb-mr1-dev 2012-09-20 14:54:10 -07:00
Dianne Hackborn
c72fc674a3 Implement multi-user PackageMonitor. 
New APIs let you indicate what user(s) to monitor, and tell you
what user is changing when receiving a callback.

Fix package manager to only deliver package brpadcasts to the
running users.  (This isn't really a change in behavior, since
the activity manager would not deliver to stopped users anyway).
Make sure all broadcasts that package monitor receives also include
user information for it to use.

Update wallpaper service to (hopefully) now Really Correctly
monitor package changes per user.

Change-Id: Idd952dd274abcaeab452277d9160d1ae62919aa0
 2012-09-20 14:53:18 -07:00
Dianne Hackborn
f8171e229b am e6f63800: Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev 
* commit 'e6f6380027d5c209eb17ec2567f00356ad32038a':
  Fix issue #7196015: system_server deadlock during setup wizard
 2012-09-20 14:36:48 -07:00
Dianne Hackborn
e6f6380027 Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev 2012-09-20 14:33:50 -07:00
Christopher Tate
b756445429 Multiuser awareness in content observer infrastructure 
Content observers are registered under the calling user's identity,
not under the provider host's identity (unless the caller is using
the new permissioned entry points that allow observers to be
registered for a different user's view of the data).  The most important
implication of this is that when the settings provider is directly
queried, the Cursor returned to the app is wired for change notifications
based on that calling app's user.

Note that it is not possible to use query() / insert() to read/write
data for different users.  All such manipulations should use the
standard get* / put* methods in Settings.*.

Bug 7122169

Change-Id: If5d9ec44927e5e56e4e7635438f4ef48a5430986
 2012-09-20 13:58:16 -07:00
Irfan Sheriff
b42fb03b79 am 6c0fcc96: am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev 
* commit '6c0fcc961e1650113947918dc105c2a459ebf40d':
  Captive check for both mobile and wifi
 2012-09-20 13:39:30 -07:00
Irfan Sheriff
6c0fcc961e am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev 
* commit '314488b791d36756504ee593f818f04b4cd24893':
  Captive check for both mobile and wifi
 2012-09-20 13:37:07 -07:00
Irfan Sheriff
314488b791 Merge "Captive check for both mobile and wifi" into jb-mr1-dev 2012-09-20 13:33:52 -07:00
Glenn Kasten
1d824dfdda am 27001b52: am d86077c3: Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 
* commit '27001b528e14e6fbfa9de67d1224f4bd96af290a':
  Expose android.media.AudioManager.getProperty()
 2012-09-20 13:01:12 -07:00
Wink Saville
f57fe0e07e am b538ba1e: am ca2cb184: Merge "Suppress location information for non-active users." into jb-mr1-dev 
* commit 'b538ba1e90fbc29d59a923ecd1d1d86d72eacffa':
  Suppress location information for non-active users.
 2012-09-20 13:01:07 -07:00
Geremy Condra
d25ce3a8a7 am 50caa25a: am d053554f: Merge "Push dropbox logging into libcore." into jb-mr1-dev 
* commit '50caa25a53efaa6f9338064436599945d6d8d616':
  Push dropbox logging into libcore.
 2012-09-20 13:01:03 -07:00
Geremy Condra
5f3becdbce am 3f1a9260: am f6e24d62: Merge "Remove pointless exception supression." into jb-mr1-dev 
* commit '3f1a92607be5f8f1448c1b2f87fa801f84ca874f':
  Remove pointless exception supression.
 2012-09-20 13:00:58 -07:00
Eric Laurent
2bb7e677b6 am 13bd3ed4: am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev 
* commit '13bd3ed4796fae13f0daaa8ce062fdd8effec737':
  Add multi user volume management
 2012-09-20 13:00:55 -07:00
Geremy Condra
fadd42395f am eaac57e1: am 4dd3c379: Merge "Remove logging for old version mismatches." into jb-mr1-dev 
* commit 'eaac57e1fbcb7e0e6245591e2c399542bc3f5822':
  Remove logging for old version mismatches.
 2012-09-20 13:00:51 -07:00
John Reck
91249ce452 am cfe353ba: am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 
* commit 'cfe353bad0e5daed9f2166ce37973f2a6b3d9c54':
  Fix DPI scaling on TVDPI
 2012-09-20 13:00:47 -07:00
Elliott Hughes
dbd0abd6f9 am ce14f217: am 3d5be42e: Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev 
* commit 'ce14f2176028108b649b3b068ac1275b81287b21':
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339
 2012-09-20 13:00:44 -07:00
Stephen Hines
1bb62cb1ea am 05bdecd2: am 5ca88a10: Merge "Add tests for pass-by-value kernels." into jb-mr1-dev 
* commit '05bdecd2f3ce82c0fd63df0a041ccce560f3d1c8':
  Add tests for pass-by-value kernels.
 2012-09-20 13:00:37 -07:00
Glenn Kasten
27001b528e am d86077c3: Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 
* commit 'd86077c3792ca03f004376d81e449a3ecdaa5e8b':
  Expose android.media.AudioManager.getProperty()
 2012-09-20 12:51:50 -07:00
Wink Saville
b538ba1e90 am ca2cb184: Merge "Suppress location information for non-active users." into jb-mr1-dev 
* commit 'ca2cb1841099c7206af93149d0326308e0d3f81a':
  Suppress location information for non-active users.
 2012-09-20 12:51:47 -07:00
Geremy Condra
50caa25a53 am d053554f: Merge "Push dropbox logging into libcore." into jb-mr1-dev 
* commit 'd053554f80adaa84d4bdde53656ccce5ae3332b6':
  Push dropbox logging into libcore.
 2012-09-20 12:51:43 -07:00
Geremy Condra
3f1a92607b am f6e24d62: Merge "Remove pointless exception supression." into jb-mr1-dev 
* commit 'f6e24d62b6fa863700e5f72d461846f2aa506109':
  Remove pointless exception supression.
 2012-09-20 12:51:40 -07:00
Eric Laurent
13bd3ed479 am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev 
* commit 'f9fac2c5fe3f304ee866b1afc3191d36835e96bd':
  Add multi user volume management
 2012-09-20 12:51:36 -07:00
Geremy Condra
eaac57e1fb am 4dd3c379: Merge "Remove logging for old version mismatches." into jb-mr1-dev 
* commit '4dd3c3797060b35c8e6ebbbdd164c17c6db7b5ec':
  Remove logging for old version mismatches.
 2012-09-20 12:51:32 -07:00
John Reck
cfe353bad0 am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 
* commit 'b6610d8289f5c682a7f66d419afcfbd6541d0367':
  Fix DPI scaling on TVDPI
 2012-09-20 12:51:29 -07:00
Elliott Hughes
ce14f21760 am 3d5be42e: Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev 
* commit '3d5be42eaa35914d9b37fe052fa7222dc1992dc0':
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339
 2012-09-20 12:51:25 -07:00
Stephen Hines
05bdecd2f3 am 5ca88a10: Merge "Add tests for pass-by-value kernels." into jb-mr1-dev 
* commit '5ca88a103c2841b64bfa01b4848aec4b8aa64687':
  Add tests for pass-by-value kernels.
 2012-09-20 12:51:21 -07:00
Glenn Kasten
d86077c379 Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 2012-09-20 12:45:45 -07:00