Commit Graph

2001 Commits

Author SHA1 Message Date
Jeff Sharkey
52e40aaa8a am 1eb1a4fa: am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '1eb1a4fa28d74312b329daaecd8a81fcf367eea4':
  Include reason when wiping data.
2014-09-25 17:05:42 +00:00
Jeff Sharkey
0a285b4462 Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:27:25 +00:00
Andreas Gampe
a2945aabd9 resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp
Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
2014-09-24 15:47:36 -07:00
Jeff Sharkey
004a4b20f8 Include reason when wiping data.
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
2014-09-24 13:58:09 -07:00
Lorenzo Colitti
542fc7be49 am 19733a32: am c17062e5: am 71915080: am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
* commit '19733a32c87d0597448318ac1665450aed03ba69':
  Block address families with routes, not NetworkAgent side channel
2014-09-24 04:13:50 +00:00
Lorenzo Colitti
60446165d8 Block address families with routes, not NetworkAgent side channel
Now that we support unreachable routes, use those to block
address families on VPNs. This is a much more elegant solution.
Also update LinkProperties when IP addresses are added and
removed, fixing a TODO.

Bug: 17462989
Change-Id: Ib749d84710dca70d672350b9f129bb91419ec77e
2014-09-23 10:48:28 +09:00
jgu21
2eacd06bfb Frameworks/base: Early init native bridge
Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
2014-09-22 16:04:37 -07:00
Amith Yamasani
d587057246 am 4ad6b3ef: am 10c291a7: am e1206a34: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev
* commit '4ad6b3ef184424e36915bc046e04706f2dded0e2':
  Allow primary user profile owner to set device restrictions
2014-09-19 16:40:50 +00:00
Amith Yamasani
c34dc7cdeb Allow primary user profile owner to set device restrictions
In addition to device owners, profile owners on the primary user
can also set user restrictions that are necessary to lock down the
user.

This is to enable the case of a profile owner registered after setup
wizard is completed, on the primary user.

Also make managed profile vs. profile wording consistent in the
DevicePolicyManager docs.

Bug: 17555025
Change-Id: Ib9d08b8af34a99b25e11757fa7dc83673a7deb32
2014-09-18 15:14:26 -07:00
Adam Powell
76e8803f5e am a72bd678: am 400521f2: am aaceaabe: am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev
* commit 'a72bd6782f42f4766fb0dcc6755d2e9cca6940f4':
  Fix UserManager#isUserAGoat
2014-09-18 03:14:18 +00:00
Adam Powell
988ae30ff7 Fix UserManager#isUserAGoat
Correctly detect if the user is a goat.

Change-Id: I78577dd7ec8c3685434ee03560010a6ea4db127f
2014-09-17 18:12:13 -07:00
John Spurlock
b9e2fe1d4a am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev
* commit '1c1683a35a0267c03729fa36b930c3dc803aff7a':
  Saver: PowerManager call to set low power mode.
2014-09-14 20:09:39 +00:00
John Spurlock
8d4e6cb060 Saver: PowerManager call to set low power mode.
- Add an explicit power manager call to set the low power mode state,
  instead of trying manage everything around a single setting.
- When low-power mode is triggered by falling below the configured
  threshold, it does not update the setting.
- The "is-enabled" api returns setting || below configured trigger.
- Move the snooze management into the new api call.
- Callers (sysui + settings) updated to use the api instead of the
  setting.
- Handles the case where the level does an unpowered leap out of the
  low battery level. (Possible if powered in-between while the device
  is off)

Bug:17460535
Change-Id: Ic030504c9cad9868a7137abbe837b170da37852b
2014-09-14 14:07:23 -04:00
Dianne Hackborn
40461ddd8c am 46c1851a: am a561b237: Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev
* commit '46c1851a7d14c8ac8614deb2183a89a44448e57c':
  Allow throwing UnsupportedOperationException across Binder.
2014-09-13 02:30:20 +00:00
Dianne Hackborn
33d738a102 Allow throwing UnsupportedOperationException across Binder.
Change-Id: I3a9b81958886033d546c3a20331716dbb9492365
2014-09-12 14:23:58 -07:00
Alexandra Gherghina
272d79c715 am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev
* commit '92f8d577c50a54e8375435813096b997d58cd368':
  Assign default icon to users at creation time and in SystemUI.
2014-09-12 19:18:43 +00:00
Alexandra Gherghina
64d4dca63f Assign default icon to users at creation time and in SystemUI.
Right now different code in System UI, Settings app and other places replace the
user icon with their own default. This tries to make it consistent by moving the
mechanism used in Settings in a helper class.

Bug: 17311038
Change-Id: Ic858c65bf82a98b9806dbba029e7cdcf441f372e
2014-09-12 15:43:42 +01:00
Michael Wright
3dd0a6aabc am 79870899: am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
* commit '7987089963e29c993146a24470d412c2e83f98fa':
  Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
2014-09-12 05:46:19 +00:00
Michael Wright
1208e2718d Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
Bug: 17290118
Change-Id: Iae3866bf3f7ac24f756ec4c183e848a79d1f779b
2014-09-12 00:23:14 +00:00
Amith Yamasani
5f0439d729 am 3b18a0c5: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev
* commit '3b18a0c5f8efdb915fb1304c959236d608eb8b79':
  Apply cross-user restrictions to Shell
2014-09-11 18:31:06 +00:00
Amith Yamasani
8cd28b57ed Apply cross-user restrictions to Shell
Even though Shell user is allowed to perform cross-user actions,
lock that path down if the target user has restrictions imposed by
the profile owner device admin that prevents access via adb.

If the profile owner has imposed DISALLOW_DEBUGGING_FEATURES, don't
allow the shell user to make the following types of calls:
start activities, make service calls, access content providers,
send broadcasts, block/unblock packages, clear user data, etc.

Bug: 15086577
Change-Id: I9669fc165953076f786ed51cbc17d20d6fa995c3
2014-09-10 17:15:06 -07:00
Amith Yamasani
1f4ea68a07 am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev
* commit 'd94df395a87836b5dba6bd159010046e1d016661':
  User restriction to disallow outgoing NFC beam
2014-09-09 21:56:09 +00:00
Amith Yamasani
da6e6c888f Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 2014-09-09 20:29:57 +00:00
Amith Yamasani
26af829fd7 User restriction to disallow outgoing NFC beam
This can be controlled by MDMs via DPM.

Also fixes:
 - javadoc for restrictions
 - persisting of cross profile copy/paste restriction

Bug: 17387303
Change-Id: Ie148f56189181d2a4c6345c0823d417ab13a94a3
2014-09-09 12:09:47 -07:00
Elliott Hughes
4656e69bf3 resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
2014-09-08 13:08:43 -07:00
Andreas Gampe
6b0ed64fb8 Frameworks/base: Add native bridge post-fork initialization
(cherry picked from commit d7746a8b65ee4690427ed798816f970218578fa3)

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-08 13:07:59 -07:00
Elliott Hughes
ab94a1676e Merge "Small documentation fixes across many files." 2014-09-08 18:44:14 +00:00
Jeff Sharkey
6098a3acc9 am fa8211c5: am 2f0ed017: Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev
* commit 'fa8211c5f7b8939e230f5643cd94a6e8686571b6':
  Delayed ASEC allocation, refine progress handling.
2014-09-08 17:00:42 +00:00
Jeff Sharkey
e016605981 Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev 2014-09-08 16:38:42 +00:00
Jeff Sharkey
77d218e186 Delayed ASEC allocation, refine progress handling.
For restore use-case, session creation needs to complete quickly, so
delay ASEC allocation until session is opened.  When preflighting
size checks, only consider external when we have a known size for the
container.  Also relax size checks when using MODE_INHERIT_EXISTING
on external, since we don't know how much of existing app will be
copied over.

Consider session as "active" while commit is ongoing, until we're
either finished or pending user interaction.

Always publish first client needle movement away from 0.  Use 25% of
internal progress to reflect ASEC allocation.

Avoid CloseGuard messages about leaking PFDs.

Bug: 17405741, 17402982
Change-Id: I6247a1d335d26621549c701c4c4575a8d16ef8c2
2014-09-08 09:31:49 -07:00
Dianne Hackborn
b30ea42a8d am 459f3911: am 9a77bddd: Merge "Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20" into lmp-dev
* commit '459f391177dd796d25d68184a0844a0420a1f33a':
  Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20
2014-09-07 19:20:06 +00:00
Dianne Hackborn
b30c9920df Merge "Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20" into lmp-dev 2014-09-07 19:04:05 +00:00
Dianne Hackborn
95ccfd9950 am 80cb4a01: am 8c7605b1: Merge "Fix issue #17397177: BatteryStats reporting error on job start/stop" into lmp-dev
* commit '80cb4a012b57110246a17e4110ccadb5bd232c55':
  Fix issue #17397177: BatteryStats reporting error on job start/stop
2014-09-06 01:09:57 +00:00
Dianne Hackborn
7895bc2e63 Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20
Change-Id: Iaf271c96901c5dba15831681269a49ad4aaa57fd
2014-09-05 17:50:47 -07:00
Dianne Hackborn
ce78347c37 Merge "Fix issue #17397177: BatteryStats reporting error on job start/stop" into lmp-dev 2014-09-06 00:49:28 +00:00
Dianne Hackborn
c3940bc1ba Fix issue #17397177: BatteryStats reporting error on job start/stop
Dumb, dumb, dumb mistake.

Also fix battery stats wakeup reason tracking to use a SamplingTimer
(like kernel wake locks) so we can track both the duration and count
for each wakeup reason.

Change-Id: I89d69661006dc533622b1b7e68a139166d3a6975
2014-09-05 17:33:06 -07:00
Mark Doliner
d0646dca40 Small documentation fixes across many files.
Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663
2014-09-05 13:57:51 -07:00
Svetoslav
79391c3c5d am 35952bf0: am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev
* commit '35952bf0e8fd0ace78b015c3cde29b322cd939bb':
  Addressing API council comments for UserManager.
2014-09-05 17:24:34 +00:00
Jeff Sharkey
8277cb60d8 am b4733a8d: am e7bea8e5: Merge "Move Size parceling to Bundle." into lmp-dev
* commit 'b4733a8dad31e10bba8a04ccefbf9016d7fd670b':
  Move Size parceling to Bundle.
2014-09-05 17:09:55 +00:00
Amith Yamasani
aa0ac1a04f am 90f3b5ad: am 0c3b7b15: Merge "Don\'t allow guests to install from unknown sources" into lmp-dev
* commit '90f3b5ad76ca3c38fb9ed23f79869eee4ebdfb39':
  Don't allow guests to install from unknown sources
2014-09-05 17:09:42 +00:00
Svetoslav
c7d62f02b8 Addressing API council comments for UserManager.
bug:17390424

Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
2014-09-05 10:07:02 -07:00
Jeff Sharkey
d3cc74cac2 Merge "Move Size parceling to Bundle." into lmp-dev 2014-09-05 16:46:00 +00:00
Amith Yamasani
a240d8377a Merge "Don't allow guests to install from unknown sources" into lmp-dev 2014-09-05 16:32:30 +00:00
Jeff Sharkey
5ef33984d0 Move Size parceling to Bundle.
Size itself shouldn't be Parcelable, since that would be a layering
violation.

Bug: 17390381
Change-Id: Ica62709bd889db51c916c550a0146714b002baa3
2014-09-05 09:07:35 -07:00
Dianne Hackborn
7d26fa32cc am 8dd4914b: am c5e138f7: Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev
* commit '8dd4914ba3ece4e408571cfcc19da4d801cecbfa':
  Fix issue #17375172...   sshhhhhh!!!
2014-09-04 23:30:11 +00:00
Andreas Gampe
dc84c6ca86 resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp
Change-Id: I7ae05c4f1b072906932a9ed47bdbad881b8e0d37
2014-09-04 16:15:52 -07:00
Dianne Hackborn
edfc6af590 Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 2014-09-04 23:08:24 +00:00
Dianne Hackborn
521e4bd7c5 Fix issue #17375172... sshhhhhh!!!
Change-Id: Idf3eafe829418bfc29e31f893ae6cff249488ffa
2014-09-04 14:50:26 -07:00
Andreas Gampe
aec67dcc02 Frameworks/base: Add native bridge post-fork initialization
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-03 21:38:34 -07:00
Amith Yamasani
29ce85bab9 Don't allow guests to install from unknown sources
Added a user restriction when creating a guest.
Made sure that guests can't install profile owners that
could undo the restriction.

Bug: 17359648
Change-Id: Icdd919e8b1cbd79a69aacb76e573ec3449f18e4c
2014-09-03 17:30:43 -07:00