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

85271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Jurka
1c46536721 am 7566abd3: Merge "Add support for changing status widget on security screen" into jb-mr1-dev 
* commit '7566abd305a2b3060ae541055ed04f087f5266ec':
  Add support for changing status widget on security screen
 2012-09-21 17:45:04 -07:00
Wu-cheng Li
baffb198a8 am c9cc62b9: Merge "Add secure version of image capture intent." into jb-mr1-dev 
* commit 'c9cc62b96561933dd9257a78c6749195fbe8fdd3':
  Add secure version of image capture intent.
 2012-09-21 17:44:59 -07:00
Raph Levien
73d2c347cb am 3034d451: Merge "Fix for native crash on image decode OOM" into jb-mr1-dev 
* commit '3034d45104f954eb15937e03ec74d86ca37894dc':
  Fix for native crash on image decode OOM
 2012-09-21 17:44:54 -07:00
Amith Yamasani
38e69e96f4 am 74defbf2: Merge "Query users excluding any being removed" into jb-mr1-dev 
* commit '74defbf202de713aa6ae19fbbf2ea5c318ccd11c':
  Query users excluding any being removed
 2012-09-21 17:44:50 -07:00
Jim Miller
eea4be2743 am 3e87eafc: Merge "Fix the build." into jb-mr1-dev 
* commit '3e87eafc7d1aef95801f1758bb78da8b2f960a75':
  Fix the build.
 2012-09-21 17:44:42 -07:00
Baligh Uddin
ae4f783597 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-21 15:42:09 -07:00
Baligh Uddin
ad16da3f9b Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-21 15:31:08 -07:00
Baligh Uddin
7ce0040f1f Import translations. DO NOT MERGE 
Change-Id: I275649d07fdc34e25808b716a7d0f82929f3a68d
Auto-generated-cl: translation import
 2012-09-21 14:11:15 -07:00
Baligh Uddin
390e74f6b6 Import translations. DO NOT MERGE 
Change-Id: I2e5afca6e7690a5c988d9442ca5e585e4a011265
Auto-generated-cl: translation import
 2012-09-21 13:52:29 -07:00
Dianne Hackborn
279b86262e am d3724b95: Merge "Don\'t load views before onResume called." into jb-mr1-dev 
* commit 'd3724b951e1fdd48bd5accc29e5dff2102efdf3e':
  Don't load views before onResume called.
 2012-09-21 13:35:26 -07:00
Fabrice Di Meglio
01143c16bb am 8da91a69: Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev 
* commit '8da91a699cefccb8d9abf2b72221bc8c1f1874fc':
  Fix bug #7205072 Text inside popup window is too close to the edge
 2012-09-21 13:35:23 -07:00
Jeff Brown
a41ebd4ad7 am f2eb2e3e: Merge "Fix javadoc." into jb-mr1-dev 
* commit 'f2eb2e3e0343da98f8bfe29a6c61d85f1cd7fbd8':
  Fix javadoc.
 2012-09-21 13:35:18 -07:00
Joe Fernandez
bcd78fbe9e am b4544d68: am c098ff66: am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev 
* commit 'b4544d68b04b98642a3799207c7a28838c865739':
  docs: Systrace tool documentation
 2012-09-21 13:35:15 -07:00
Jean-Baptiste Queru
c0f0391c6f am 91254a02: (-s ours) am fea72d3b: Ignore 12496bfc into jb-dev-plus-aosp 
* commit '91254a025b984890851d270eadedbf6b0ea3e7db':
  Add --output-text-symbols option to aapt. do not merge.
 2012-09-21 13:35:11 -07:00
Adam Cohen
44f52cf7e1 am 11a6450e: Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev 
* commit '11a6450e543d5c178c60ce2216fad1b29bf15457':
  Fixing partiallyUpdateAppWidget to cache the new changes
 2012-09-21 13:35:02 -07:00
Irfan Sheriff
ffded18154 am 957fadc5: Merge "Use min group owner intent for concurrency" into jb-mr1-dev 
* commit '957fadc5001be0f0b4d004dbed8c57b6e1f5b46a':
  Use min group owner intent for concurrency
 2012-09-21 13:34:58 -07:00
Jason Sams
4a77c9db6a am da6f7ab3: Merge "Fix aprox fs function names bug b206696" into jb-mr1-dev 
* commit 'da6f7ab34c23a6cbe31734e5d562baa224e3d3d6':
  Fix aprox fs function names bug b206696
 2012-09-21 13:34:55 -07:00
Romain Guy
7d00dee7fc am 596bcc23: Merge "Optimize tiling management Bug #7186819" into jb-mr1-dev 
* commit '596bcc23a7cbf07d1465cfc8caa33b6c87fe6a16':
  Optimize tiling management Bug #7186819
 2012-09-21 13:34:51 -07:00
Mathias Agopian
9f85dfb88d am 0aac9b7d: Merge "GLSurfaceView defaults to 888 instead of 565" into jb-mr1-dev 
* commit '0aac9b7d53946c6e5d8d3855afb3d993aee14519':
  GLSurfaceView defaults to 888 instead of 565
 2012-09-21 13:34:47 -07:00
Jeff Brown
9f94633370 am b4c33679: Merge "Disentangle input manager service startup." into jb-mr1-dev 
* commit 'b4c33679cbdec9e12369fb49469ce33ed83ed25c':
  Disentangle input manager service startup.
 2012-09-21 13:34:44 -07:00
Jeff Brown
76a678e802 am ddfaa3f5: Merge "Provide a debugging option to force enable wifi display." into jb-mr1-dev 
* commit 'ddfaa3f55638db2e3d7c9928b605c2e6b90facae':
  Provide a debugging option to force enable wifi display.
 2012-09-21 13:34:40 -07:00
John Reck
cea904c91e am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev 
* commit 'e6ff47840fc6d8ac5ba551101684011e328b4caa':
  Use less static synchronized
 2012-09-21 13:34:36 -07:00
Fabrice Di Meglio
fe3b3c03a3 am a21ad1a3: Merge "Fix bug #7198224 TimePicker widget shouldn\'t be completely RTL" into jb-mr1-dev 
* commit 'a21ad1a39423a22921511432f61dbfe2f4b3e58b':
  Fix bug #7198224 TimePicker widget shouldn't be completely RTL
 2012-09-21 13:34:33 -07:00
Eric Laurent
41da58338f am 6730c3c6: Merge "Fix safe volume warning message flickering" into jb-mr1-dev 
* commit '6730c3c69f84d799198365e0692b79be72b0eeb7':
  Fix safe volume warning message flickering
 2012-09-21 13:34:29 -07:00
Zhihai Xu
ad577aae75 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-21 13:34:26 -07:00
Baligh Uddin
a91074953d am 2f98008d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2f98008d06cbe48f0f5619d16f59988952c9b2ca':
  Import translations. DO NOT MERGE
 2012-09-21 13:33:39 -07:00
Christopher Tate
5d978525bc am 58e7f73c: Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev 
* commit '58e7f73c6e2d6583be0beabc95e7ac430bef0eb4':
  Multiuser awareness in content observer infrastructure
 2012-09-21 13:33:34 -07:00
Tsu Chiang Chuang
dad8235dca 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-21 13:33:17 -07:00
Tsu Chiang Chuang
4990a850ff 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-21 13:33:01 -07:00
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
Michael Jurka
7566abd305 Merge "Add support for changing status widget on security screen" into jb-mr1-dev 2012-09-21 01:10:53 -07:00
Wu-cheng Li
c9cc62b965 Merge "Add secure version of image capture intent." into jb-mr1-dev 2012-09-21 01:08:00 -07:00
Wu-cheng Li
37959ef70f Add secure version of image capture intent. 
bug:7141738

Change-Id: I77789ffb53e70efd946f331286a895b7a1239661
 2012-09-21 14:47:47 +08:00
Raph Levien
3034d45104 Merge "Fix for native crash on image decode OOM" into jb-mr1-dev 2012-09-20 23:25:26 -07:00
Amith Yamasani
74defbf202 Merge "Query users excluding any being removed" into jb-mr1-dev 2012-09-20 23:08:45 -07:00
Raph Levien
005bfc694d Fix for native crash on image decode OOM 
When decoding an image with scaling, if the allocation of the bitmap
data for the scaled bitmap failed, we were just ignoring it and going
on. This was yielding strange native crashes (bug 7196860 and bug
7175536). This patch checks whether the allocation succeeds, and returns
a null bitmap if not.

Of course, if the app really is OOM because it's allocated too many
bitmaps, it'll still get the OOME, but that's a lot nicer than a native
crash or memory corruption.

Change-Id: I8384059ab11c2ab9e93e283b9438d79e6709b7b1
 2012-09-20 22:51:47 -07:00
Amith Yamasani
920ace0bbc Query users excluding any being removed 
Keep track of user creation and last logged-in time.
adb shell dumpsys users
User switcher shouldn't show users about to be removed.
No need to check for singleton for activities.

Bug: 7194894
Change-Id: Ic9a59ea5bd544920479e191d1a1e8a77f8b6ddcf
 2012-09-20 22:33:43 -07:00
Jim Miller
3e87eafc7d Merge "Fix the build." into jb-mr1-dev 2012-09-20 22:01:35 -07:00
Jim Miller
e5de9919b4 Fix the build. 
Change-Id: I80e2c915ba4c10dcb53b6a21152dc787e16d9e8f
 2012-09-20 21:57:46 -07:00
Michael Jurka
20c41d5382 Add support for changing status widget on security screen 
Change-Id: I080fd89eb84445604c602b6e807b55153a7ee129
 2012-09-20 19:19:41 -07:00
Dianne Hackborn
d3724b951e Merge "Don't load views before onResume called." into jb-mr1-dev 2012-09-20 19:13:56 -07:00
Fabrice Di Meglio
8da91a699c Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev 2012-09-20 18:51:23 -07:00
Jeff Brown
f2eb2e3e03 Merge "Fix javadoc." into jb-mr1-dev 2012-09-20 18:47:50 -07:00