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

85188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
22b46b6fa4 am 6de76d21: Merge "Implement multi-user PackageMonitor." into jb-mr1-dev 
* commit '6de76d21ff60818f8b296fc8f645897203f475da':
  Implement multi-user PackageMonitor.
 2012-09-21 13:32:57 -07:00
Dianne Hackborn
342737d543 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-21 13:32:45 -07:00
Irfan Sheriff
917fc95cac 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-21 13:32:22 -07:00
Lei Zhang
534a076c81 Fix auto-merger error in I74c0644c6938d28c20c42d88d995ffb56a71d703 
Change-Id: If199aa3f01d1a7ea3f298504c0de4aa9a96e7451
 2012-09-21 12:39:39 -07:00
Glenn Kasten
43e5916e67 am d86077c3: Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 
* commit 'd86077c3792ca03f004376d81e449a3ecdaa5e8b':
  Expose android.media.AudioManager.getProperty()
 2012-09-21 11:04:39 -07:00
Wink Saville
77196b41da 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-21 11:04:35 -07:00
Jason Simmons
f445a77bf3 resolved conflicts for merge of d053554f to jb-mr1-aah-dev 
Change-Id: I8540083f7fd04e252c8879475f247ea6bbde8159
 2012-09-21 10:38:01 -07:00
Baligh Uddin
5ce605c130 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-21 08:32:20 -07:00
Justin Koh
b4641b5cd4 Merge "Converts hover touch events to trackball events" into jb-mr1-aah-dev 2012-09-20 18:04:49 -07:00
Baligh Uddin
39a5bd11e0 Import translations. DO NOT MERGE 
Change-Id: Ifc884b96fc9de3742c1df60fd0ab92571b8df4d8
Auto-generated-cl: translation import
 2012-09-20 16:01:23 -07:00
Baligh Uddin
6f05fed13f Import translations. DO NOT MERGE 
Change-Id: Ia8b80c26e65bc3bde079ed2e4391d9ce344af49a
Auto-generated-cl: translation import
 2012-09-20 15:44:36 -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
e6f6380027 Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev 2012-09-20 14:33:50 -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
Geremy Condra
75f5b6aba6 am f6e24d62: Merge "Remove pointless exception supression." into jb-mr1-dev 
* commit 'f6e24d62b6fa863700e5f72d461846f2aa506109':
  Remove pointless exception supression.
 2012-09-20 12:51:09 -07:00
Eric Laurent
c08870e946 am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev 
* commit 'f9fac2c5fe3f304ee866b1afc3191d36835e96bd':
  Add multi user volume management
 2012-09-20 12:51:05 -07:00
Geremy Condra
23f1c10e63 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:02 -07:00
John Reck
18fc6e8493 am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 
* commit 'b6610d8289f5c682a7f66d419afcfbd6541d0367':
  Fix DPI scaling on TVDPI
 2012-09-20 12:50:55 -07:00
Elliott Hughes
3a8b3a85e1 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:50:52 -07:00
Stephen Hines
e6d3e43ec2 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:50:46 -07:00
Glenn Kasten
d86077c379 Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 2012-09-20 12:45:45 -07:00
Wink Saville
ca2cb18410 Merge "Suppress location information for non-active users." into jb-mr1-dev 2012-09-20 12:37:19 -07:00
Glenn Kasten
62796aac59 Expose android.media.AudioManager.getProperty() 
Also fix minor documentation errors.

Bug: 6635041
Change-Id: I6bbbf1b7c5ab705ac374436ea0c098cb3c27fd4a
 2012-09-20 12:28:20 -07:00
Irfan Sheriff
9538bdd3c7 Captive check for both mobile and wifi 
Bug: 7113195
Bug: 7102238
Bug: 7087564

Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1
 2012-09-20 12:13:06 -07:00
Geremy Condra
d053554f80 Merge "Push dropbox logging into libcore." into jb-mr1-dev 2012-09-20 11:24:14 -07:00
Geremy Condra
f6e24d62b6 Merge "Remove pointless exception supression." into jb-mr1-dev 2012-09-20 11:22:14 -07:00
Eric Laurent
f9fac2c5fe Merge "Add multi user volume management" into jb-mr1-dev 2012-09-20 11:18:17 -07:00
Geremy Condra
4dd3c37970 Merge "Remove logging for old version mismatches." into jb-mr1-dev 2012-09-20 10:33:03 -07:00
Baligh Uddin
2bdc3ca533 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-20 10:24:37 -07:00
John Reck
b6610d8289 Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 2012-09-20 10:21:41 -07:00
Wink Saville
a12a7b3d3d Suppress location information for non-active users. 
Specifically, don't allow call backs for LISTEN_CELL_LOCATION and
LISTEN_CELL_INFO.

Bug: 7087342
Change-Id: Ida7f60b5bde3f28264dcb454b38fcfb1f1616d11
 2012-09-20 10:09:45 -07:00
Elliott Hughes
3d5be42eaa Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev 
* changes:
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339
 2012-09-20 10:05:44 -07:00
Stephen Hines
5ca88a103c Merge "Add tests for pass-by-value kernels." into jb-mr1-dev 2012-09-20 09:55:25 -07:00
Jason Sams
6205af4cfa am 95cd451e: Merge "add cleanspec." into jb-mr1-dev 
* commit '95cd451ef1b1c7390ec08da730f6bf0b268ed833':
  add cleanspec.
 2012-09-20 09:26:28 -07:00
Jason Sams
95cd451ef1 Merge "add cleanspec." into jb-mr1-dev 2012-09-20 09:21:39 -07:00
Jason Sams
1dd273a7df add cleanspec. 
Change-Id: I5aa58efa7c48809d1f05c8ad48332508597b9869
 2012-09-20 09:12:43 -07:00
Chris Wren
fc850997a8 am 683ab00a: fix underfull content bug in inbox and big text templates. 
* commit '683ab00a2ec2e02f8ad1296efb381aa72d364b57':
  fix underfull content bug in inbox and big text templates.
 2012-09-20 08:42:00 -07:00
Chris Wren
683ab00a2e fix underfull content bug in inbox and big text templates. 
Bug: 7172721
Change-Id: I22019009eec31ca18b54eec5f6ed5b626cee1540
 2012-09-20 10:54:40 -04:00
John Spurlock
5d514eb468 am e0de5bff: Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev 
* commit 'e0de5bfff2e74ee566ac2d053052de09aa25e54b':
  Fire "dreaming started" and "dreaming stopped" broadcasts.
 2012-09-20 06:24:20 -07:00
Jason Sams
3009f0f616 am 8e356e08: Merge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev 
* commit '8e356e089d4b9cf1cd0f31ceead666f8e75d4c28':
  Cleanup blur test, remove deprecated functions.
 2012-09-20 06:23:51 -07:00
Jeff Brown
e108978db5 am f803ff4f: Merge "Make wifi display state changes more robust." into jb-mr1-dev 
* commit 'f803ff4f743f63dbbb9382d1e1ef7adc25a88e24':
  Make wifi display state changes more robust.
 2012-09-20 06:23:43 -07:00
Baligh Uddin
fa5c67d601 am e02acec9: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'e02acec9ea52b0f04b891adeb17ad9d5e42f86da':
  Import translations. DO NOT MERGE
 2012-09-20 06:23:27 -07:00
Jeff Brown
cf11e2381a am 925ad51b: Merge "Add support for remembering Wifi display devices." into jb-mr1-dev 
* commit '925ad51bd82b34fa26a462a303781c610e635450':
  Add support for remembering Wifi display devices.
 2012-09-20 06:23:20 -07:00
Jim Miller
3945caec4e am d5d853ec: Merge "Update keyguard selector view to match UX design spec - Use new Roboto-Thin font - Add new keyguard-specific date format - Layout tweaks to keyguard selector screen. - Add smart EmergencyButton class - Add selective upper-casing of components on th 
* commit 'd5d853ec48bc4ad3d6f0ec5cdc20821550cbf3f8':
  Update keyguard selector view to match UX design spec - Use new Roboto-Thin font - Add new keyguard-specific date format - Layout tweaks to keyguard selector screen. - Add smart EmergencyButton class - Add selective upper-casing of components on the display to enable later UX decision - Work around SIM state bug
 2012-09-20 06:23:08 -07:00
Romain Guy
a7dfff1109 am 4c97ef90: Merge "Add support for QCOM_tiled_rendering Bug #7186819" into jb-mr1-dev 
* commit '4c97ef9094f7a52dbc983ed12ce5f3b586f2d769':
  Add support for QCOM_tiled_rendering Bug #7186819
 2012-09-20 06:23:04 -07:00
Jeff Sharkey
ef33caf85a am 4e7b551f: Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev 
* commit '4e7b551fbffa6112821ed6cfeedd6128463fccd0':
  Move HAS_TRANSIENT_STATE flag into a safe area.
 2012-09-20 06:22:39 -07:00
Jeff Sharkey
e3981fa8f3 am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev 
* commit 'c3e3311c050f47a229e1b49f1fdf685669d79d53':
  Migrate network stats from removed users.
 2012-09-20 06:22:35 -07:00
Christopher Tate
40ccfee497 am c575e007: Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev 
* commit 'c575e007e59e00db7c1f3f2b2ea57cc24dd7c2de':
  setShowGTalkServiceStatus() is deprecated but tested by CTS
 2012-09-20 06:22:26 -07:00
Baligh Uddin
819898df2d am 30ddd69d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '30ddd69d07bafc1c9f906cfd176992ebaa58068e':
  Import translations. DO NOT MERGE
 2012-09-20 06:22:21 -07:00