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

11313 Commits

Author SHA1 Message Date
Amith Yamasani
399a2977a5 am b3a98725: Merge "Show an error dialog when account type is requested on a limited user" into jb-mr2-dev 
* commit 'b3a9872549137f6c3983609e48e5b2d4fc94a3d4':
  Show an error dialog when account type is requested on a limited user
 2013-04-10 17:33:35 -07:00
Amith Yamasani
b3a9872549 Merge "Show an error dialog when account type is requested on a limited user" into jb-mr2-dev 2013-04-11 00:27:49 +00:00
Christopher Tate
e775cee176 am 04f5c8cb: am 790518a1: Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev 
* commit '04f5c8cb95f1f4f09bc0feacab36088066e58afb':
  Implicitly enable system apps when updates installed
 2013-04-10 17:08:42 -07:00
Amith Yamasani
9422bdca31 Don't sync from adapters that haven't opted in to restricted accounts 
SyncManager should not allow syncing of data from apps that haven't opted
in to viewing restricted accounts in limited users.

Override getIsSyncable() to check if the sync adapter has the manifest
entry to enable restricted accounts of that account type. Return the default
isSyncable state if the adapter has opted in, otherwise return 0 for false.

Bug: 8566533
Change-Id: I3777f1e4fdb8debe1724ab083272e2d9bd2e63f2
 2013-04-10 17:06:02 -07:00
Christopher Tate
04f5c8cb95 am 790518a1: Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev 
* commit '790518a1a2f06030d19fdd896bd0f80dd03d94fc':
  Implicitly enable system apps when updates installed
 2013-04-10 17:04:46 -07:00
Craig Mautner
7a078314b4 am 98874efb: am cc979c9e: Merge "Debug logging improvement." into jb-mr2-dev 
* commit '98874efb994faca3bf253e9547cbb6227d44eb38':
  Debug logging improvement.
 2013-04-10 17:00:47 -07:00
Christopher Tate
790518a1a2 Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev 2013-04-10 23:58:37 +00:00
Craig Mautner
98874efb99 am cc979c9e: Merge "Debug logging improvement." into jb-mr2-dev 
* commit 'cc979c9eae387d80e4c4129d18991d708dde44a6':
  Debug logging improvement.
 2013-04-10 16:57:50 -07:00
Craig Mautner
cc979c9eae Merge "Debug logging improvement." into jb-mr2-dev 2013-04-10 23:54:29 +00:00
Santos Cordon
d8ff71bdaf am 0a5eb3ec: am acd840d5: Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev 
* commit '0a5eb3eca776c414a2d170c8e697edad19f9e957':
  Obfuscate any phone numbers that pass through the event log.
 2013-04-10 16:00:40 -07:00
Santos Cordon
0a5eb3eca7 am acd840d5: Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev 
* commit 'acd840d5c31bee48cc13a03f5e0c5e3b69ff23db':
  Obfuscate any phone numbers that pass through the event log.
 2013-04-10 15:57:07 -07:00
Santos Cordon
acd840d5c3 Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev 2013-04-10 22:53:08 +00:00
Jaikumar Ganesh
a934b7c99a am 7228e1ae: am 8ce470dd: GPS Hardware geofencing. 
* commit '7228e1aeb9a2af8fad410749e2adc61266b2649a':
  GPS Hardware geofencing.
 2013-04-10 15:38:24 -07:00
Amith Yamasani
23c8b96a7e Show an error dialog when account type is requested on a limited user 
This covers the scenario where an app doesn't find an account of the
required type and requests the account manager to add one of that
type.

Bug: 8537648
Change-Id: I4d9c8842c2d90aa668f16034d3db007dc61714b8
 2013-04-10 15:36:54 -07:00
Jaikumar Ganesh
7228e1aeb9 am 8ce470dd: GPS Hardware geofencing. 
* commit '8ce470dd4ba0608abb6b5eae117cefca927af96b':
  GPS Hardware geofencing.
 2013-04-10 15:34:35 -07:00
Craig Mautner
66d7730903 Debug logging improvement. 
Previously a change to a surface would be logged with the old value
and you had to scroll through the logs to see what the new value
was. This change reflects the change to the surface immediately.

Change-Id: I2a6566466287922d08f4ce2329c61aa46d692ee1
 2013-04-10 15:33:26 -07:00
Robert Greenwalt
a9bebc2211 Use CONNECTIVITY_INTERNAL for global proxy 
The Global http proxy shouldn't be used by apps, but can be useful in certain
conditions.

bug:8264794
bug:8557674
Change-Id: Ia3cbe542e448d9e74d0492626a13e9fd34ad797a
 2013-04-10 15:32:18 -07:00
Jaikumar Ganesh
8ce470dd4b GPS Hardware geofencing. 
Add support for doing geofencing in hardware.

Change-Id: I6d5015190e8d84e1f4beb1010ed977a71c1622d0
 2013-04-10 15:25:07 -07:00
Dianne Hackborn
229f1aadf9 am abe0aa78: am 8f980e1a: Merge "Reduce duration of rotation xfade animation." into jb-mr2-dev 
* commit 'abe0aa78caf81b24af0b45700801fc1f867cfa0e':
  Reduce duration of rotation xfade animation.
 2013-04-10 11:01:28 -07:00
Dianne Hackborn
abe0aa78ca am 8f980e1a: Merge "Reduce duration of rotation xfade animation." into jb-mr2-dev 
* commit '8f980e1a5ae99d5e34aaef6aac7f38a7d0038631':
  Reduce duration of rotation xfade animation.
 2013-04-10 10:51:50 -07:00
Dianne Hackborn
8f980e1a5a Merge "Reduce duration of rotation xfade animation." into jb-mr2-dev 2013-04-10 17:48:21 +00:00
Christopher Tate
32a019d438 Implicitly enable system apps when updates installed 
If someone explicitly installs an update to a system-bundled package,
we infer that this means they actually want to use the new code.

Bug 7467302

Change-Id: If2dc6f764bafbb3a5c94cbdd32273c030fd784b9
 2013-04-09 17:11:55 -07:00
Jean-Christophe PINCE
1d08e599fe Watchdog race condition when sending message out of synchronized 
A race condition leading to false positive detections might occur
when the monitoring thread executes very fast and terminates before
the sending thread entered the synchronized section.

Change-Id: I6fe686f8f12393e11fa18326508af5b73738f9d7
Author: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 81644
 2013-04-09 15:02:40 -07:00
Robert Greenwalt
74a2a5dae0 am 27370393: am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev 
* commit '273703935d185b82e5d5e8a0ae2363743558227f':
  Turn back on global proxy support.
 2013-04-09 14:25:20 -07:00
Dianne Hackborn
875422153d resolved conflicts for merge of e9b4ee69 to master 
Change-Id: Id752ae94f63a66b2ec200f68c73bf0d7b04b249f
 2013-04-09 11:56:06 -07:00
Robert Greenwalt
979ee3cca3 Routing workaround. 
Change our order of operations so that secondary route table
adds succeed.  Working to understand the why of this too.
bug:8361314

Change-Id: Ie25061eb38c62eaa5e60aa8a488496de49bdbd9d
 2013-04-09 11:22:56 -07:00
Robert Greenwalt
273703935d am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev 
* commit 'dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf':
  Turn back on global proxy support.
 2013-04-09 11:19:34 -07:00
Robert Greenwalt
dbf500aaaf Merge "Turn back on global proxy support." into jb-mr2-dev 2013-04-09 18:15:06 +00:00
Dianne Hackborn
e9b4ee692c am 558a3c1b: Merge "Kill processes when permissions are revoked." into jb-mr2-dev 
* commit '558a3c1b7b40eb9356f8c4446ca63af8cf16bd91':
  Kill processes when permissions are revoked.
 2013-04-09 10:42:09 -07:00
Dianne Hackborn
558a3c1b7b Merge "Kill processes when permissions are revoked." into jb-mr2-dev 2013-04-09 17:38:00 +00:00
Dianne Hackborn
f1b782427f Kill processes when permissions are revoked. 
Some permissions are associated with gids, so we need to
kill any running processes if their permission is revoked.
We will do this for any permission being revoked, since
the association between gids and permissions can change
over time.

Change-Id: Ieb7408e032539c4f21eb089d65a7a7e6c289f010
 2013-04-08 22:28:59 -07:00
Eric Rowe
675d389f6f am fa67c5ad: am 3c09715c: Merge "Change dropbox tag for native crashes." into jb-mr2-dev 
* commit 'fa67c5ada25643953144895f961c9ce0f8cc31e7':
  Change dropbox tag for native crashes.
 2013-04-08 19:15:19 -07:00
Eric Rowe
fa67c5ada2 am 3c09715c: Merge "Change dropbox tag for native crashes." into jb-mr2-dev 
* commit '3c09715cedc737cc6e36c201d9f9188c3615e9a5':
  Change dropbox tag for native crashes.
 2013-04-08 17:15:33 -07:00
Eric Rowe
3c09715ced Merge "Change dropbox tag for native crashes." into jb-mr2-dev 2013-04-09 00:11:51 +00:00
Kenny Root
c21e2cb672 am b3be67ce: am 0eee410e: Merge "Check outInfo is not null" into jb-mr2-dev 
* commit 'b3be67ce34966dfccfccf4918ee5c93c4971a6d0':
  Check outInfo is not null
 2013-04-08 17:05:50 -07:00
Ben Gruver
1b4e91dfbf am 0b909eb6: am 89454f83: Merge "Implement event logging for intent firewall" into jb-mr2-dev 
* commit '0b909eb6bf621198f5f5b49f9f13a165597c823d':
  Implement event logging for intent firewall
 2013-04-08 17:05:22 -07:00
Robert Greenwalt
00e8d4c1b6 Turn back on global proxy support. 
This reverts 138626.

Bug:8557674
Change-Id: I7b117d313c424d75bdeeea507541a96342f256f0
 2013-04-08 16:31:26 -07:00
Kenny Root
b3be67ce34 am 0eee410e: Merge "Check outInfo is not null" into jb-mr2-dev 
* commit '0eee410e473c1546af80c63ec866655a28833f33':
  Check outInfo is not null
 2013-04-08 16:16:44 -07:00
Kenny Root
0eee410e47 Merge "Check outInfo is not null" into jb-mr2-dev 2013-04-08 23:10:50 +00:00
Kenny Root
3b9933d0c2 Check outInfo is not null 
Only call keystore if outInfo is not null

Bug: 8568820
Change-Id: I24ab625ad02b8510da489911064453de642b6748
 2013-04-08 16:06:24 -07:00
Eric Rowe
88d842cf8a Change dropbox tag for native crashes. 
Change-Id: Id2738fc758c3d144e5fdd2c7f1c8617dad129338
 2013-04-08 15:00:27 -07:00
Ben Gruver
7b879f4b93 resolved conflicts for merge of 0929c3b1 to master 
Change-Id: I70d4b652e804f3e607b1cd1b6837204c77610d87
 2013-04-08 14:56:55 -07:00
Ben Gruver
0b909eb6bf am 89454f83: Merge "Implement event logging for intent firewall" into jb-mr2-dev 
* commit '89454f8331cd7d582eafca87c6586feb5db509c7':
  Implement event logging for intent firewall
 2013-04-08 14:44:46 -07:00
Ben Gruver
0929c3b140 am b1a90d3b: Merge "Remove the sender package filter from the intent firewall" into jb-mr2-dev 
* commit 'b1a90d3b1422b0eb469e8960e6398a49ec036e0b':
  Remove the sender package filter from the intent firewall
 2013-04-08 14:41:06 -07:00
Ben Gruver
89454f8331 Merge "Implement event logging for intent firewall" into jb-mr2-dev 2013-04-08 21:40:26 +00:00
Ben Gruver
b1a90d3b14 Merge "Remove the sender package filter from the intent firewall" into jb-mr2-dev 2013-04-08 21:36:37 +00:00
Ben Gruver
a4879c3425 Monitor the firewall rules file for changes 
Change-Id: I4e9a8f06cc535ba5a347e6992e1466cff09890e9
 2013-04-08 14:27:37 -07:00
Daniel Sandler
a92c7971b1 am 684d24cf: am dc634351: Merge "Clean up language in forced foreground service notifications." into jb-mr2-dev 
* commit '684d24cf664330288d7e91d33e0d8426bb3960e0':
  Clean up language in forced foreground service notifications.
 2013-04-08 12:55:36 -07:00
Daniel Sandler
684d24cf66 am dc634351: Merge "Clean up language in forced foreground service notifications." into jb-mr2-dev 
* commit 'dc634351d4f8a59e4b5743c58571d1ef04da668a':
  Clean up language in forced foreground service notifications.
 2013-04-08 12:51:33 -07:00
Daniel Sandler
91fe8455d6 Clean up language in forced foreground service notifications. 
Old:  [ IC ] %s running
      [ ON ] %s is running

New:  [ IC ] %s is running
      [ ON ] Touch for more information or to stop the app.

Additionally, disallow these misbehaving services from
supplying their own content views; if you attempt to run a
foreground service with icon == 0, this is the notification
you will get, period.

Bug: 8525548
Change-Id: I2bfd7340396ef925885e8c2160a720f9eff07a35
 2013-04-08 13:01:02 -04:00