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

11275 Commits

Author SHA1 Message Date
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
David Christie
feedb1b095 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 2013-04-15 23:35:44 +00:00
Svetoslav
2602a3974a BinderDied may be called after we unregistered the death recipient. 
It is possible that an accessibility service's package was force stopped
during whose handling the death recipient is unlinked and still get a call
on binderDied since the call was made before we unlink but was waiting on
the lock we held during the force stop handling. Added a check whether the
service is already disconnected and if so do nothing.

bug:8600388

Change-Id: I4a9ca305b9863d986b930a7c1ec8f9006b16a333
 2013-04-15 16:30:12 -07:00
Dianne Hackborn
f5cfab41c3 am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev 
* commit 'a59a19abb8f284beb478ff2492493251b91a2847':
  Fix issue #8512015: VideoView's window animates when its position changes
 2013-04-15 16:25:05 -07:00
Dianne Hackborn
a59a19abb8 Merge "Fix issue #8512015: VideoView's window animates when its position changes" into jb-mr2-dev 2013-04-15 23:22:48 +00:00
Geremy Condra
baa58cdb9f am bffe377b: Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev 
* commit 'bffe377bca3cb8240bfc614c12fd1091ae3f69b9':
  Add logic to handle changes to file_contexts during update.
 2013-04-15 16:13:56 -07:00
Geremy Condra
bffe377bca Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev 2013-04-15 23:11:12 +00:00
David Christie
1b9b7b1f1b 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.

Change-Id: Ibd9ce28b0401372b995a0dbfb2f0a984dd11c0b1
 2013-04-15 15:31:11 -07:00
Dianne Hackborn
1c5383ce0b Fix issue #8512015: VideoView's window animates when its position changes 
Change-Id: I79eee6b9672b7d72eabe5d20be639c05a6f3d72b
 2013-04-15 15:07:21 -07:00
Svetoslav
1f3d844add am 7919ea98: am 7af3d056: Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev 
* commit '7919ea98668abe3782f00f78cc48fc1ed011c49e':
  Crash on non-eng builds due to lacking null check.
 2013-04-15 15:00:00 -07:00
Svetoslav
ed8998094a am f9dd9338: am 289e6497: Merge "Fully setup newly bound service before state management." into jb-mr2-dev 
* commit 'f9dd9338d0849aaf9c5a4b4905a3884787685fa4':
  Fully setup newly bound service before state management.
 2013-04-15 14:59:57 -07:00
Geremy Condra
f33575b05b Add logic to handle changes to file_contexts during update. 
Bug: 8116902

(cherry picked from commit a2dffda3b3bc4f0bccb175ef4569e45a221d0eb2)

Change-Id: I57c21681d5f94e00d0214fb520ea62af4ea5b025
 2013-04-15 14:56:58 -07:00