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

61088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
e706cef1c5 am b5de5985: Merge "Add -nosystem flag to adb backup" 
* commit 'b5de598554a97c557a3e0c20c28bbe5454164a6d':
  Add -nosystem flag to adb backup
 2011-10-04 16:18:24 -07:00
Christopher Tate
b5de598554 Merge "Add -nosystem flag to adb backup" 2011-10-04 16:16:11 -07:00
Jason Sams
0de1a6632e am 3c1951c4: Merge "Fix crash running old HC apps." 
* commit '3c1951c442e40f7f46775acfc8a22c24f04d8cfc':
  Fix crash running old HC apps.
 2011-10-04 15:55:06 -07:00
Jason Sams
3c1951c442 Merge "Fix crash running old HC apps." 2011-10-04 15:53:37 -07:00
Dave Santoro
e8d5015223 am f0f2ff1a: (-s ours) am 7d535138: (-s ours) DO NOT MERGE New permissions for social stream. 
* commit 'f0f2ff1a5ba1f7d3ff30db3099efeaae71c01db1':
  DO NOT MERGE New permissions for social stream.
 2011-10-04 15:51:23 -07:00
Dave Santoro
f0f2ff1a5b am 7d535138: (-s ours) DO NOT MERGE New permissions for social stream. 
* commit '7d535138c15b3e9f90432fb942f9027fa334b681':
  DO NOT MERGE New permissions for social stream.
 2011-10-04 15:48:22 -07:00
Dave Santoro
ef728978b3 am 2aeecb7a: Merge "Add new permissions for read/write social stream." 
* commit '2aeecb7aa57242aae29dddff2b9ebd5d21aa3824':
  Add new permissions for read/write social stream.
 2011-10-04 15:47:39 -07:00
Jason Sams
795072ec7b Fix crash running old HC apps. 
Change-Id: If7206de334868cb40eb8e5dd04fbe8c70bc1d614
 2011-10-04 15:46:57 -07:00
Dave Santoro
2aeecb7aa5 Merge "Add new permissions for read/write social stream." 2011-10-04 15:46:10 -07:00
Dave Santoro
0b61f59d77 Add new permissions for read/write social stream. 
This is a manual merge of a change going in to ICS-FactoryROM.

These permissions are needed to separate the (potentially invasive)
access to the user's social stream from the existing read/write
contacts permission.

Per discussion with Android release team, we are also hiding the
stream item API until we figure out a better way to guard the data.

Bug 5406886

Change-Id: I8339d743c3ebe8923c7ee47f2900444efcf82a52
 2011-10-04 15:35:48 -07:00
Christopher Tate
240c7d2d1f Add -nosystem flag to adb backup 
This makes it easy to back up everything that belongs to 3rd party apps, but
nothing that comes with the system per se.  If any system packages are
explicitly named on the command line they will be included in the backup
even if -nosystem was passed.  So, for example, this will back up all 3rd
party apps as well as system settings, but nothing else belonging to
system-deployed apps:

   adb backup -all -nosystem com.android.provider.settings

Bug 5361503

Change-Id: Iebe04b7d7027ca58b9f55e8eb7f219d6cca69269
 2011-10-04 15:35:00 -07:00
Dave Santoro
7d535138c1 DO NOT MERGE New permissions for social stream. 
These permissions are needed to separate the (potentially invasive)
access to the user's social stream from the existing read/write
contacts permission.

Per discussion with Android release team, we are also hiding the
stream item API until we figure out a better way to guard the data.

Bug 5406886

Change-Id: I8339d743c3ebe8923c7ee47f2900444efcf82a52
 2011-10-04 15:09:54 -07:00
Ben Komalo
f98a21ee7f am a1aebdf7: Merge "New PIN unlock screen layout." 
* commit 'a1aebdf787443413ba870fc9203639405a5ff7bf':
  New PIN unlock screen layout.
 2011-10-04 14:29:51 -07:00
Ben Komalo
a1aebdf787 Merge "New PIN unlock screen layout." 2011-10-04 14:27:24 -07:00
Joe Fernandez
90b66cb321 am cac15eb2: Merge "docs: add developer guide cross-references, Project ACRE" 
* commit 'cac15eb21cab68e5b76fe06f9aff273978c92054':
  docs: add developer guide cross-references, Project ACRE
 2011-10-04 14:04:53 -07:00
Joe Fernandez
cac15eb21c Merge "docs: add developer guide cross-references, Project ACRE" 2011-10-04 14:03:12 -07:00
Michael Jurka
fd056b1086 am 30433b83: Merge "Reduce height of recent app thumbnails" 
* commit '30433b83cc1473721800a22effc84ce0cb1118f2':
  Reduce height of recent app thumbnails
 2011-10-04 14:02:55 -07:00
Michael Jurka
30433b83cc Merge "Reduce height of recent app thumbnails" 2011-10-04 14:01:08 -07:00
The Android Open Source Project
d73f75db0b am 01c40563: Reconcile with ics-factoryrom-release 
* commit '01c405636477b4c7fef9377fa5ae652afa1815c3':
 2011-10-04 13:59:23 -07:00
Joe Fernandez
b54e7a3d9f docs: add developer guide cross-references, Project ACRE 
Change-Id: I5df1c4e13af67ff4c4a5b22f3cb1247bf0103b09
 2011-10-04 13:57:00 -07:00
The Android Open Source Project
01c4056364 Reconcile with ics-factoryrom-release 
Change-Id: I35a78040547d4f13dcf96639a229b0b64a18bbf8
 2011-10-04 13:56:58 -07:00
Jeff Sharkey
3b3f26abb6 am 50a2f8ea: Merge "Read iface stats from single proc file." 
* commit '50a2f8ea9d855c58f589cfaa12235a742185021d':
  Read iface stats from single proc file.
 2011-10-04 13:53:41 -07:00
Jeff Sharkey
50a2f8ea9d Merge "Read iface stats from single proc file." 2011-10-04 13:52:24 -07:00
Michael Jurka
9316e7e31b Reduce height of recent app thumbnails 
Change-Id: I225147d49a6d7b71a08ca0464e702c0aeadb419d
 2011-10-04 13:52:05 -07:00
Danielle Millett
ec41b1a15b am b177b190: Merge "Fix 5405210: DevicePolicyManager doesn\'t allow Face Unlock" 
* commit 'b177b190a0c24754fc9af042681be7cd0284040e':
  Fix 5405210: DevicePolicyManager doesn't allow Face Unlock
 2011-10-04 13:26:28 -07:00
Danielle Millett
b177b190a0 Merge "Fix 5405210: DevicePolicyManager doesn't allow Face Unlock" 2011-10-04 13:23:55 -07:00
Jeff Sharkey
ae2c181083 Read iface stats from single proc file. 
When available, use single "iface_stat_all" file instead of reading
values from dozens of files scattered across proc.  Tests to verify.

Bug: 5397840
Change-Id: I0247be518436c1f79b32c4b72216739f49a9e8cc
 2011-10-04 13:22:39 -07:00
Jeff Sharkey
ba36487a48 am c58111b3: Merge "Track xtables summary, move tether stats, time." 
* commit 'c58111b307018da66bc227ed5ca019f7d8143b9a':
  Track xtables summary, move tether stats, time.
 2011-10-04 13:13:55 -07:00
Jeff Sharkey
c58111b307 Merge "Track xtables summary, move tether stats, time." 2011-10-04 13:12:06 -07:00
Amith Yamasani
ea7f9f473d am e5320a02: Merge "Tie the lockscreen sounds with the ringer volume." 
* commit 'e5320a0270816122ba7939431cc80ed37a5b691b':
  Tie the lockscreen sounds with the ringer volume.
 2011-10-04 13:04:12 -07:00
Amith Yamasani
e5320a0270 Merge "Tie the lockscreen sounds with the ringer volume." 2011-10-04 13:02:31 -07:00
Irfan Sheriff
c08ea6af1e am 2e93402d: Merge "Reduce/Fix system logging" 
* commit '2e93402d0e90b484df8ee2ca0319e49ae20614ca':
  Reduce/Fix system logging
 2011-10-04 12:16:25 -07:00
Irfan Sheriff
2e93402d0e Merge "Reduce/Fix system logging" 2011-10-04 12:13:27 -07:00
Irfan Sheriff
7f8a12c75c Reduce/Fix system logging 
Bug: 5410239
Change-Id: I2f91dfde0b701e8905a1235696591b3154693c7c
 2011-10-04 12:01:31 -07:00
Gilles Debunne
fdfea1d2e5 am 8c60235b: Merge "5402566: Copy/cut icons do not appear if the text is Japanese only" 
* commit '8c60235b550ecbd5cba594584f78ef6630953e56':
  5402566: Copy/cut icons do not appear if the text is Japanese only
 2011-10-04 10:52:47 -07:00
Gilles Debunne
e5eccea432 am a13a322e: Merge "Optimisations and bugs in SpellChecker" 
* commit 'a13a322e090c50549ce5a42c382e1ef668cf0481':
  Optimisations and bugs in SpellChecker
 2011-10-04 10:52:45 -07:00
Gilles Debunne
8c60235b55 Merge "5402566: Copy/cut icons do not appear if the text is Japanese only" 2011-10-04 10:51:13 -07:00
Gilles Debunne
a13a322e09 Merge "Optimisations and bugs in SpellChecker" 2011-10-04 10:50:54 -07:00
Matthew Xie
da208048c1 am 3b8e0726: Merge "Send TURN_HOT message to the state machine from BluetoothService after it starts" 
* commit '3b8e07269a66f54163452adbd2557d406253592c':
  Send TURN_HOT message to the state machine from BluetoothService after it starts
 2011-10-04 10:23:19 -07:00
Matthew Xie
3b8e07269a Merge "Send TURN_HOT message to the state machine from BluetoothService after it starts" 2011-10-04 10:21:37 -07:00
Danielle Millett
c8fb532d45 Fix 5405210: DevicePolicyManager doesn't allow Face Unlock 
If Face Unlock is currently enabled when the device policy manager is installed
it now forces the user to choose a new acceptable lock type

Change-Id: I725e923240538df3f706251670bf497857d2a25f
 2011-10-04 12:18:51 -04:00
Kenny Root
56eb64900d am afb119c5: Merge "Add explicit mimetype for verifier calls" 
* commit 'afb119c5e19fe74bc99fd7ad2c4bcc21612872a5':
  Add explicit mimetype for verifier calls
 2011-10-04 09:05:27 -07:00
Kenny Root
afb119c5e1 Merge "Add explicit mimetype for verifier calls" 2011-10-04 09:04:06 -07:00
Alon Albert
b69595c943 am 62abf34d: Merge "Update dumpsys output" 
* commit '62abf34d0dce0deb017b18beef3d8f73bd90981a':
  Update dumpsys output
 2011-10-04 08:41:25 -07:00
Alon Albert
62abf34d0d Merge "Update dumpsys output" 2011-10-04 08:39:46 -07:00
The Android Automerger
dac3a04312 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-04 06:28:35 -07:00
Flavio Lerda
906da90834 am 3c5cef23: Merge "Add a cached formatted phone number to call log." 
* commit '3c5cef23aa504e9f424aee8ed4399b0ad35a4493':
  Add a cached formatted phone number to call log.
 2011-10-04 02:26:37 -07:00
Flavio Lerda
3c5cef23aa Merge "Add a cached formatted phone number to call log." 2011-10-04 02:24:28 -07:00
Jim Miller
34cfd4ae04 am ebccf3c2: Merge "Fix 5185505: allow facelock to be enabled by a setting." 
* commit 'ebccf3c2c8f31d54505b6250ef87c8db5587c1bc':
  Fix 5185505: allow facelock to be enabled by a setting.
 2011-10-03 22:01:44 -07:00
Jim Miller
ebccf3c2c8 Merge "Fix 5185505: allow facelock to be enabled by a setting." 2011-10-03 22:00:03 -07:00