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

13530 Commits

Author SHA1 Message Date
Dianne Hackborn
a6e8ebb12f am fb4e1c21: am 25b49734: Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev 
* commit 'fb4e1c21eddf07fad7b36ac5e19dd2d479e71c5c':
  Fix issue #8540550: Screenshots should never have transparency
 2013-04-17 19:07:03 -07:00
Dianne Hackborn
fb4e1c21ed am 25b49734: Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev 
* commit '25b49734cac1ecd17dba2af2a1af8328490236d4':
  Fix issue #8540550: Screenshots should never have transparency
 2013-04-17 19:03:09 -07:00
Dianne Hackborn
ca46b87118 Fix issue #8540550: Screenshots should never have transparency 
Make sure the thumbnail bitmap is initialized with a black
background.

Change-Id: I87c00d309b7d30b6085a751aa4ae22cf146c74f5
 2013-04-17 18:06:22 -07:00
Jim Miller
9b4b662c27 resolved conflicts for merge of 6825c478 to master 
Change-Id: Id9657db0b3623c329ae2cff3916c2d0eb4301dd7
 2013-04-17 16:27:30 -07:00
Jim Miller
6825c47830 am 9bf7be93: Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev 
* commit '9bf7be933d039ef227ca54f917c1ff6a00a2f833':
  Add permission check for owner-info related LockSettings.
 2013-04-17 15:49:23 -07:00
Craig Mautner
61cc1b632a Merge "Steady improvement to multi stack." 2013-04-17 22:35:02 +00:00
Jim Miller
158fe19ff8 Add permission check for owner-info related LockSettings. 
Fixes bug 8512972

Change-Id: I372ef892000e5de9075783f06b722e2911cfc90d
 2013-04-17 15:26:10 -07:00
Jim Miller
3569e9e50c resolved conflicts for merge of 2f6a2526 to master 
Change-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a
 2013-04-17 14:18:56 -07:00
Craig Mautner
29219d963d Steady improvement to multi stack. 
- Fix back button behavior with two stacks. Stopping activities were
held in that state indefinitely. This change causes IDLE_NOW_MSG to
be sent immediately for the last activity in a stack.

- Touch in non-focused stack was being ignored because of focus tests
in AbsListView.

- Change the focused stack when the activity focus changes. Renamed
mMainStack to mFocusedStack to reflect this.

- Resume all top stack activities when resuming.

- Assign intent task to ActivityRecord if it doesn't have a task.
Fixes bug 8433463.

Change-Id: I8d3c806234511697bc209ab99890730ffa514d20
 2013-04-17 13:54:48 -07:00
Jim Miller
2f6a2526db am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 
* commit 'b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
  Move owner info from Settings.Secure to LockSettings
 2013-04-17 13:44:23 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00
Amith Yamasani
c1ce6e1a79 am ac16c21d: am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'ac16c21d11c1545efb8deafbcb7c120a5e0821a1':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:34:28 -07:00
Amith Yamasani
ac16c21d11 am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'a0042742c8941519718cc8872a84cfec10294386':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:30:41 -07:00
Amith Yamasani
a0042742c8 Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 2013-04-17 18:26:49 +00:00
Christopher Tate
a952f9d590 am 0bd7a2f2: am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 
* commit '0bd7a2f27120e945376217e2300ac2cd8bb00059':
  Lengthen the AM timeout reading crash reports slightly
 2013-04-17 11:13:29 -07:00
Christopher Tate
0bd7a2f271 am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 
* commit 'effb153abaf57023382a7cb0cd64215f1db2992c':
  Lengthen the AM timeout reading crash reports slightly
 2013-04-17 11:11:30 -07:00
Christopher Tate
effb153aba Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 2013-04-17 18:08:19 +00:00
Amith Yamasani
7e99bc02c8 Modify restrictions bundle per api council recommendations 
Use a Bundle for persisting and passing to the application, but use a
list to return data back from an application that's exposing restrictions.

Changed the xml reading/writing code to store the value type in the Bundle
so that it can be reproduced when reading. Earlier we were assuming only
String and String[].

Bug: 8633967

Change-Id: I523d5553728edcf28a1e9d432f490b4956f34215
 2013-04-17 10:44:44 -07:00
Christopher Tate
1b64598602 Lengthen the AM timeout reading crash reports slightly 
We're missing some (small fraction of) native crash reports from
debuggerd.  It looks like under high system load the debuggerd
reporting code just isn't quite timely enough for the very short
timeouts initially deployed, so lengthen those a bit.

Bug 8552010

Change-Id: Icbc5b6517de3bb98fff1af2ea42ffd208ef20412
 2013-04-17 10:40:02 -07:00
Daniel Sandler
a38006d74f am 74c69f1e: am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 
* commit '74c69f1e0c184faeaf0e02f2a0445d1c436b6287':
  Treat the default sound Uri the same as DEFAULT_SOUND.
 2013-04-17 09:12:11 -07:00
Daniel Sandler
74c69f1e0c am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 
* commit '66769767b68f3fbe586c153d9d483916e4d9006b':
  Treat the default sound Uri the same as DEFAULT_SOUND.
 2013-04-17 09:07:02 -07:00
Daniel Sandler
66769767b6 Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 2013-04-17 16:04:33 +00:00
Daniel Sandler
3147523c10 Treat the default sound Uri the same as DEFAULT_SOUND. 
For the purposes of deciding whether or not to invoke the
"fallback vibrate", that is. (RingtonePicker will return
content://settings/system/notification_sound when "Default"
is chosen, so if the app pops this Uri directly into
Notification.sound, we should treat it like DEFAULT_SOUND
and look to see whether the system notification sound is
not None before running the fallback vibration.)

Bug: 8627641
Change-Id: Ia469b8e4d5d7647ce1a8a179f591ed7a3443b5c5
 2013-04-17 10:59:50 -04:00
Satoshi Kataoka
7987a3172b Fix possible NPE 
Bug: 8517083
Change-Id: Iea6bdcb0e39ee951b7f90f41cd3350bd1c7c5f71
 2013-04-17 18:59:33 +09:00
Craig Mautner
bbcc289dad Merge "Incremental repairs to side by side stacks." 2013-04-17 01:58:51 +00:00
Craig Mautner
53078b25c9 Merge "Implement stack splitting and task movement." 2013-04-17 01:58:15 +00:00
Craig Mautner
4cd0c13f8f Incremental repairs to side by side stacks. 
- Add taskId parameter to createStack() so stacks are pre-populated
with a task.
- Keep track of stack access order in DisplayContent so getTasks
returns in MRU order.
- Set touchableRegion in InputMonitor so modal touching does not
extend beyond stack boundary.
- Fix stack merging so that deleting a stack results in a new
stack the size of the two children.

Change-Id: I62a6ba0a34f34dd7ec866b440bf04595379e19e8
 2013-04-16 18:55:07 -07:00
Jim Miller
187ec581c6 Move owner info from Settings.Secure to LockSettings 
Fixes bug 8512972

Change-Id: Ic046aff0332b78489dda08b1e9e71f4c16154f10
 2013-04-16 18:33:43 -07:00
Ben Gruver
303d004ca0 am e920a298: am 53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev 
* commit 'e920a298f7ee7005b05a0d689e0aae5ca1b369e9':
  Monitor the firewall rules file for changes
 2013-04-16 17:51:04 -07:00
Ben Gruver
e920a298f7 am 53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev 
* commit '53f22ad9c30e03f4762737a722b2762dcf934523':
  Monitor the firewall rules file for changes
 2013-04-16 17:47:57 -07:00
Ben Gruver
53f22ad9c3 Merge "Monitor the firewall rules file for changes" into jb-mr2-dev 2013-04-17 00:44:56 +00:00
Dmitry Shmidt
92dc450782 Merge "softap: Set broadcast option explicitly" 2013-04-16 23:59:50 +00:00
Dmitry Shmidt
dfddc9e5cf softap: Set broadcast option explicitly 
Change-Id: I3f045b5427e68223d0b0be995d3d8c00a9ad21bc
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-04-16 13:20:35 -07:00
Svetoslav
1f65c79dbd am a60c8c25: am 8297e68d: Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev 
* commit 'a60c8c25fdd3c9c7ae6807f7c208697a989a7486':
  BinderDied may be called after we unregistered the death recipient.
 2013-04-16 11:32:29 -07:00
Svetoslav
a60c8c25fd am 8297e68d: Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev 
* commit '8297e68d84a6edc8ecb6d17d5ba2043075f921ff':
  BinderDied may be called after we unregistered the death recipient.
 2013-04-16 11:30:18 -07:00
Svetoslav
8297e68d84 Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev 2013-04-16 18:27:43 +00:00
Stan Chesnutt
83a68e042a am 464f4ea3: am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev 
* commit '464f4ea35526863d489255c0493786f5d3e03f6f':
  Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.
 2013-04-15 21:55:21 -07:00
Daniel Sandler
1a0f755971 am 0a8ed3f2: am 4b6d23d7: Merge "Further reduce memory usage of notification archive." into jb-mr2-dev 
* commit '0a8ed3f214ad9d4cd173cbffe6e712c395a108f6':
  Further reduce memory usage of notification archive.
 2013-04-15 21:55:15 -07:00
Daniel Sandler
7c3d3f8b62 am 220fa85e: am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev 
* commit '220fa85eac119fa51b1febbc4361afb4531f949b':
  Finish annotating Notification.extras.
 2013-04-15 21:55:12 -07:00
David Christie
f63d3c64cb am e8ae4eaf: am feedb1b0: Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-de 
* commit 'e8ae4eafea69ccdffd91865f46ee2d569cdc1203':
  Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently.
 2013-04-15 21:54:47 -07:00
Dianne Hackborn
11dfb30c2f am f5cfab41: am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev 
* commit 'f5cfab41c3ea1eb0cd99f7a9387af7df2b2e5991':
  Fix issue #8512015: VideoView's window animates when its position changes
 2013-04-15 21:54:39 -07:00
Stan Chesnutt
464f4ea355 am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev 
* commit 'b34b3211e01b0ae946f786b220f73d340159503b':
  Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.
 2013-04-15 19:52:52 -07:00
Stan Chesnutt
b34b3211e0 Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev 2013-04-16 02:49:45 +00:00
Stan Chesnutt
1d72d8c33d Re-introduce single-shot mode, set MS Assist Mode A when in 
single-shot mode.

Fixes bug http://b.corp.google.com/issue?id=8204392

Change-Id: I5594447c75abab6b71bd12706409666bb75736c5
 2013-04-15 19:18:02 -07:00
Daniel Sandler
0a8ed3f214 am 4b6d23d7: Merge "Further reduce memory usage of notification archive." into jb-mr2-dev 
* commit '4b6d23d7b45f813bee52747b3243ce46ff9edbd0':
  Further reduce memory usage of notification archive.
 2013-04-15 18:48:06 -07:00
Daniel Sandler
4b6d23d7b4 Merge "Further reduce memory usage of notification archive." into jb-mr2-dev 2013-04-16 01:44:11 +00:00
Daniel Sandler
5e62e3aa7d Further reduce memory usage of notification archive. 
- Max 250 notifications preserved (was 1000)
- Known heavyweight extras are removed
- print some of 'em out in dumpstate, while we're at it

Bug: 8280039
Bug: 8537938
Change-Id: I9239128c32a1d9f5ef4e0dc62dc2d23e190871e9
 2013-04-16 01:43:49 +00:00
Daniel Sandler
220fa85eac am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev 
* commit 'f094d221e53e2359f886ae3d601c490ade70443e':
  Finish annotating Notification.extras.
 2013-04-15 18:42:33 -07:00
Daniel Sandler
f094d221e5 Merge "Finish annotating Notification.extras." into jb-mr2-dev 2013-04-16 01:38:54 +00:00
David Christie
e8ae4eafea am feedb1b0: Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev 
* commit 'feedb1b095f94e4bd153aeee78da07d963892071':
  Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently.
 2013-04-15 16:39:08 -07:00