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

105789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
3826e8bd6e am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 
* commit '374904621a79eb12416da4a26be515ae9a2d243a':
  Unhide MediaExtractor.getPsshInfo()
 2013-06-11 14:10:26 -07:00
Scott Main
be173f6a16 am 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug: 9359960" into jb-mr2-dev 
* commit '8fb120b67d785dc5ab0ebdb8efd7988da1a94365':
  add ViewGroup's layoutMode attribute to public resources bug: 9359960
 2013-06-11 14:10:18 -07:00
Scott Main
2ccb564d80 am 938e8b67: am d731c902: am f0380a26: am 343f581d: Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev 
* commit '938e8b67c2c9d0e4c797a317a10148be42aa80ec':
  fix typo and clarify class references in database lesson bug: 9372560
 2013-06-11 14:10:16 -07:00
Baligh Uddin
26560925f7 am ebb17713: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'ebb17713dac153a0efdbb9ec102b8a6a99242f5f':
  Import translations. DO NOT MERGE
 2013-06-11 14:10:03 -07:00
Ashish Sharma
c8aa0b49a6 am 58100fb8: Merge "Do not allow 0 or smaller periodicity for syncs. b/9295383" into jb-mr2-dev 
* commit '58100fb813f4a68386757fc80244dbb756ea35d5':
  Do not allow 0 or smaller periodicity for syncs. b/9295383
 2013-06-11 14:09:56 -07:00
John Spurlock
46ae41221f am a9221987: Merge "Save Notification large icon to extras." into jb-mr2-dev 
* commit 'a9221987c047a9a05da9cc4f3446a0d581494a85':
  Save Notification large icon to extras.
 2013-06-11 14:09:53 -07:00
Scott Main
26bc073dfa am fe7c2220: Merge "add NA message for any "signature" level permissions" into jb-mr2-dev 
* commit 'fe7c2220a129d3bea753f14f111b4f6e335de237':
  add NA message for any "signature" level permissions
 2013-06-11 14:09:47 -07:00
Chris Craik
8cb26c099d am cb5d644f: Merge "Workaround possible use after delete" into jb-mr2-dev 
* commit 'cb5d644fb8956962b6a89f8d384b16819af5fdf9':
  Workaround possible use after delete
 2013-06-11 14:09:41 -07:00
Daniel Sandler
0a2ff8db43 am 4e5694aa: Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev 
* commit '4e5694aaa7e03723e248c0d1e47e5a322c403a90':
  Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
 2013-06-11 14:09:38 -07:00
Daniel Sandler
cd5b3310e2 Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev 2013-06-11 20:57:39 +00:00
Zhihai Xu
bcc6ae88f9 Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev 2013-06-11 19:38:59 +00:00
Scott Main
276c72b714 am 8f678878: am 6e15b52e: am 7728e1d6: replace obsolete links. bug: 9380063 
* commit '8f6788786bdd36e26b6219b94ce7288115e020af':
  replace obsolete links. bug: 9380063
 2013-06-11 08:03:22 -07:00
Scott Main
8f6788786b am 6e15b52e: am 7728e1d6: replace obsolete links. bug: 9380063 
* commit '6e15b52e712d4c1836a06c579452ce872c1dfd91':
  replace obsolete links. bug: 9380063
 2013-06-11 08:01:13 -07:00
Scott Main
6e15b52e71 am 7728e1d6: replace obsolete links. bug: 9380063 
* commit '7728e1d6543df2758687b4b62b9c626d1c3e59dd':
  replace obsolete links. bug: 9380063
 2013-06-11 07:59:18 -07:00
Scott Main
7728e1d654 replace obsolete links. 
bug: 9380063

Change-Id: Ib40ce359bfd5f44494c5b378e768d73011c29636
 2013-06-11 07:54:31 -07:00
The Android Automerger
257cc10c95 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-11 05:55:18 -07:00
Marco Nelissen
374904621a Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 2013-06-11 04:01:47 +00:00
Christopher Tate
87bc7e7082 Need to explicitly disable scan-always when turning off wifi 
... when you want wifi to be really most sincerely off, because
settings restore is about to rewrite the conf file.

Bug 9032154

Change-Id: I6a3a34ac3f14ec43aa9d9cc0159fca6168ccd0a2
 2013-06-10 16:55:02 -07:00
Scott Main
8fb120b67d Merge "add ViewGroup's layoutMode attribute to public resources bug: 9359960" into jb-mr2-dev 2013-06-10 23:54:10 +00:00
Scott Main
938e8b67c2 am d731c902: am f0380a26: am 343f581d: Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev 
* commit 'd731c902408b0a86deb8fce04b8391bec756f498':
  fix typo and clarify class references in database lesson bug: 9372560
 2013-06-10 16:19:13 -07:00
Scott Main
d731c90240 am f0380a26: am 343f581d: Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev 
* commit 'f0380a267c8ae9c351d5799752fe5fdb9b210800':
  fix typo and clarify class references in database lesson bug: 9372560
 2013-06-10 16:17:45 -07:00
Scott Main
f0380a267c am 343f581d: Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev 
* commit '343f581de20c9a7ddeb69271e6c1e19c2f417b19':
  fix typo and clarify class references in database lesson bug: 9372560
 2013-06-10 16:16:33 -07:00
Scott Main
343f581de2 Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev 2013-06-10 23:14:32 +00:00
Baligh Uddin
45bd14ffb2 Import translations. DO NOT MERGE 
Change-Id: Iaa894cf0f19b3e153c980a9a48a92beb361124ec
Auto-generated-cl: translation import
 2013-06-10 15:19:01 -07:00
Ashish Sharma
89581aef18 Do not allow 0 or smaller periodicity for syncs. 
b/9295383

Change-Id: I5f758f4a033d74e42a04b214a6b70b94d394280d
(cherry picked from commit 4970974d74a2986a333e645a5c141ef5f9a753cc)
 2013-06-10 15:18:49 -07:00
John Spurlock
e18b34d003 Save Notification large icon to extras. 
This piece of semantic info was defined, cleared properly on
lightenPayload, but never saved.

Change-Id: Ib2c5372a57d2a01617e401231c150260d22b05d6
 2013-06-10 15:18:36 -07:00
Chris Craik
cc65fbc2da Workaround possible use after delete 
bug:9321162
Change-Id: Ic35af5b5925da56e9a143e6b33658831038f3b72
 2013-06-10 15:18:19 -07:00
Daniel Sandler
9698fa4c38 Do not block notifications or toasts for SYSTEM_UID or PHONE_UID. 
The specific bug is this: SIM PIN unlock attempt toasts are
sent from com.android.settings/.IccLockSettings which runs
as the phone process; NoMan wasn't having any of that and
was blocking the toasts.

With this change we treat SYSTEM_UID and PHONE_UID the same
for all security checks, and furthermore we guarantee that
all notifications and toasts from those UIDs will be
permitted.

Bug: 9098802
Change-Id: Idc788527aa2cb38e015fe92773766a514167999e
 2013-06-10 15:18:04 -07:00
Romain Guy
3ad5dfda32 Don't orphan footers with transient state 
Bug #8725945

Selecting text in an EditText causes the View to have transient
state. This would in turn cause the View to be removed from its
ListView parent. When removed, the EditText would lose its
AttachInfo, causing all sorts of problems. Headers and footers
must not be removed, only detached. This is the part of the fix
in AbsListView.

Fixing AbsListView triggered a second bug: when a View is removed
from the Window manager, it would keep its parent assigned, thus
making it impossible to add it again to the window manager. When
a ViewRootImpl goes through doDie(), it must set its content view's
parent to null to properly cleanup.

Change-Id: I0489daa74f8f7fcf85526f0928f8925ec30d4f42
 2013-06-10 15:17:48 -07:00
Jeff Sharkey
9e87efbb00 Avoid logging sensitive data. 
When building commands to send across NativeDaemonConnector, scrub
sensitive arguments to prevent them from being logged.

Bug: 8609800
Change-Id: I84b16791749264a010f7e59f9918f68d71bac6b9
 2013-06-10 15:17:32 -07:00
Marco Nelissen
ecba2e4b95 Unhide MediaExtractor.getPsshInfo() 
b/9373882

Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
 2013-06-10 15:06:28 -07:00
Scott Main
dc74caa7e8 add ViewGroup's layoutMode attribute to public resources 
bug: 9359960

Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
 2013-06-10 14:51:37 -07:00
Baligh Uddin
ebb17713da Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-06-10 21:07:18 +00:00
Scott Main
802254faa1 fix typo and clarify class references in database lesson 
bug: 9372560

Change-Id: I703c4196a026cb0b1469ee55491ee674868768ca
 2013-06-10 13:54:37 -07:00
Ashish Sharma
58100fb813 Merge "Do not allow 0 or smaller periodicity for syncs. b/9295383" into jb-mr2-dev 2013-06-10 20:15:59 +00:00
John Spurlock
a9221987c0 Merge "Save Notification large icon to extras." into jb-mr2-dev 2013-06-10 20:11:19 +00:00
Scott Main
fe7c2220a1 Merge "add NA message for any "signature" level permissions" into jb-mr2-dev 2013-06-10 19:21:17 +00:00
Ashish Sharma
59dc7a8e75 Do not allow 0 or smaller periodicity for syncs. 
b/9295383

Change-Id: I5f758f4a033d74e42a04b214a6b70b94d394280d
(cherry picked from commit 4970974d74a2986a333e645a5c141ef5f9a753cc)
 2013-06-10 19:14:52 +00:00
Chris Craik
cb5d644fb8 Merge "Workaround possible use after delete" into jb-mr2-dev 2013-06-10 19:12:19 +00:00
Scott Main
93e60b5b26 add NA message for any "signature" level permissions 
Change-Id: If76e9e3b7ffc5d97422321db312a03869c407f08
 2013-06-10 12:03:07 -07:00
Daniel Sandler
4e5694aaa7 Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev 2013-06-10 18:31:51 +00:00
Chris Craik
9abddd54d4 Workaround possible use after delete 
bug:9321162
Change-Id: Ic35af5b5925da56e9a143e6b33658831038f3b72
 2013-06-10 11:30:37 -07:00
Romain Guy
7a6e129759 am 8d8fc469: Merge "Don\'t orphan footers with transient state Bug #8725945" into jb-mr2-dev 
* commit '8d8fc469952ffe3feb45e52388f2129f8dd5e40c':
  Don't orphan footers with transient state Bug #8725945
 2013-06-10 10:26:57 -07:00
Romain Guy
8d8fc46995 Merge "Don't orphan footers with transient state Bug #8725945" into jb-mr2-dev 2013-06-10 17:23:25 +00:00
Wink Saville
45ac9645da Allow carrier provisioning to turn toggle radio power. 
Previously CarrierProvisioning toggle airplane mode, but now that's
available only by the system.

Bug: 9356811
Change-Id: I5167f8614c07bafb688983a360a008f76403b2b8
 2013-06-10 10:10:42 -07:00
Daniel Sandler
7c011302b6 Do not block notifications or toasts for SYSTEM_UID or PHONE_UID. 
The specific bug is this: SIM PIN unlock attempt toasts are
sent from com.android.settings/.IccLockSettings which runs
as the phone process; NoMan wasn't having any of that and
was blocking the toasts.

With this change we treat SYSTEM_UID and PHONE_UID the same
for all security checks, and furthermore we guarantee that
all notifications and toasts from those UIDs will be
permitted.

Bug: 9098802
Change-Id: Idc788527aa2cb38e015fe92773766a514167999e
 2013-06-10 12:19:16 -04:00
John Spurlock
bf563368e1 Save Notification large icon to extras. 
This piece of semantic info was defined, cleared properly on
lightenPayload, but never saved.

Change-Id: Ib2c5372a57d2a01617e401231c150260d22b05d6
 2013-06-10 11:45:17 -04:00
The Android Open Source Project
b72a220411 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I40b8952e805164e6d984273872241dc6be2ad80a
 2013-06-10 08:13:45 -07:00
Baligh Uddin
eca9982412 Import translations. DO NOT MERGE 
Change-Id: Iaa894cf0f19b3e153c980a9a48a92beb361124ec
Auto-generated-cl: translation import
 2013-06-10 07:52:12 -07:00
The Android Automerger
f4a87a6ff1 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-10 05:55:18 -07:00