Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,276 Commits 3 Branches 0 Tags
f5c178bdd3fcfe261ea43cbeef5c325a615af0e1
Commit Graph

45273 Commits

Author SHA1 Message Date
Robin Lee
7d6af106c1 am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev 
* commit '03d82225660ebed7bd14ad9cdab300eb0c4b0d18':
  Add DevicePolicyManager PrivateKey mgmt
 2014-09-11 18:30:16 +00:00
Bernhard Bauer
26408ccd8e Add DevicePolicyManager PrivateKey mgmt 
Additional device policy API to install keypairs to the keychain
silently.

Bug: 15065444
Change-Id: Idc25774c9ab1a61080290bebd6f5c4f24e6ee2e0
 2014-09-11 19:17:00 +01:00
Matthew Williams
9bff6a03b3 am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit '3812a38b496e011166ca9e23620965eaace03bdc':
  Add flag to JobParameters for job expired
 2014-09-11 17:39:30 +00:00
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +00:00
Amith Yamasani
735350449c am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev 
* commit '30a5e35bb2541f89f90b12d690085451c814a1dc':
  Apply cross-user restrictions to Shell
 2014-09-11 16:54:51 +00:00
Amith Yamasani
f58e532e01 Merge "Apply cross-user restrictions to Shell" into lmp-dev 2014-09-11 16:46:34 +00:00
Alexandra Gherghina
802669e7f8 am 3507cc0f: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit '3507cc0f8474d28b834fd4382397975478c63725':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-11 16:31:57 +00:00
Alexandra Gherghina
88de59f096 am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit 'e667e41bb60cbe5e6bde545ecaf1c7d9c8b36af1':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-11 16:21:27 +00:00
Przemyslaw Szczepaniak
25183677ef am 817dbc8c: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev 
* commit '817dbc8c2aa437388617238e3fb6c4dc6ecf5849':
  Replace TreeSet with HashSet.
 2014-09-11 16:16:24 +00:00
George Mount
6929f050ef am 6a6c4eed: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 
* commit '6a6c4eed6b1bf7f3a00b28b41d984d0113377b76':
  Omit appearing views that have a parent that is also appearing.
 2014-09-11 16:16:20 +00:00
Alexandra Gherghina
ffb6343938 Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 2014-09-11 16:12:59 +00:00
Przemyslaw Szczepaniak
676a422fa0 am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev 
* commit 'b0a86a068abf500f1ee2292cfac79af7f6830dfa':
  Replace TreeSet with HashSet.
 2014-09-11 16:11:31 +00:00
George Mount
2c563d5ffc am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 
* commit '1ca196bb7db9105b3ede380ce259a1c45b30a964':
  Omit appearing views that have a parent that is also appearing.
 2014-09-11 16:11:28 +00:00
Julia Reynolds
3fb8348ecd am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'a098030f70a4861a4c0f7241d8a95f1d6441e5ed':
  Allow device owners to update LOCATION_MODE.
 2014-09-11 16:04:20 +00:00
Julia Reynolds
c889315c66 am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit '086bf8e1ef3beac49adea005a1e3275605cd4a41':
  Allow device owners to update LOCATION_MODE.
 2014-09-11 16:02:45 +00:00
Alexandra Gherghina
557186b0ac am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit 'b04106ed46919030b944b02a8a227f8fe343c5a5':
  Remove package level intent forwarding.
 2014-09-11 16:02:15 +00:00
Paul Jensen
36ef999b11 am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 
* commit 'c1dad5c2e953535f61a6438a13cee40088786d58':
  Flush HTTP socket pools and DNS cache when binding process to a Network.
 2014-09-11 16:01:59 +00:00
Paul Jensen
db5a70b82f am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 
* commit '7f1343eec6a94092236044381b92d8085605ee4f':
  Make Network.openConnection() share HttpHandlers not OkHttpClients.
 2014-09-11 16:01:55 +00:00
Alan Viverette
63eb94ae73 am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 
* commit '515699a4a0235d8cd39fd586067e9d2857e6bda4':
  Use Calendar day of week rather than Time in SimpleMonthView
 2014-09-11 15:59:37 +00:00
Przemyslaw Szczepaniak
6931cc9f41 Merge "Replace TreeSet with HashSet." into lmp-dev 2014-09-11 15:59:36 +00:00
Svetoslav Ganov
47f09dc91c am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev 
* commit 'f0ccea9264761b45d55f7d98c234cfb3afde79be':
  Using the correct package name for ContentResolver
 2014-09-11 15:59:34 +00:00
Dianne Hackborn
a104fb92c0 am 022cfcda: Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev 
* commit '022cfcda265079cc694079db43bd58efcbd4958a':
  Fix issue #17414533: update batterystats occasionally takes a couple...
 2014-09-11 15:59:23 +00:00
Dianne Hackborn
35fc269dc6 am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 
* commit 'b4ee4428d34002aea54e9dc62902f14dedf69604':
  Fix issue #17428001: Fix revokeUriPermissions
 2014-09-11 15:59:19 +00:00
Lajos Molnar
b8f6ebf028 am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit '3b22910c898f26e604f7823b65c0f4d02e396ffb':
  add android.util.SizeF.parseSizeF()
 2014-09-11 15:59:15 +00:00
Alan Viverette
d509a2dfa6 am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev 
* commit '78f863c7c00948817ede61ec59e47c990009b00d':
  Fix docs and nulling behavior for TextView.setCompoundDrawables
 2014-09-11 15:58:35 +00:00
Alan Viverette
cdd5221105 am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '8b5ef83e1ba6ae3584d041654726315e996fe2d5':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-11 15:58:27 +00:00
Przemyslaw Szczepaniak
3786bc5498 Replace TreeSet with HashSet. 
Both Locale and Voice do not implement Comparable.

Bug: 17467923
Change-Id: I683577e5b18ae1892e1ccea5ea241e1d016c9517
 2014-09-11 16:56:46 +01:00
George Mount
27d83aa9a8 Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 2014-09-11 15:53:36 +00:00
Julia Reynolds
d86734b469 Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 2014-09-11 15:46:07 +00:00
Alexandra Gherghina
ad8adc1b40 am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit '04d1560cac01a35776e84210b1e41038a4d7df84':
  Remove package level intent forwarding.
 2014-09-11 15:36:21 +00:00
Alexandra Gherghina
02b6addb53 Merge "Remove package level intent forwarding." into lmp-dev 2014-09-11 15:17:21 +00:00
Adam Connors
e107c3eb79 Remove package level intent forwarding. 
Clean up unused methods.

Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
 2014-09-11 15:42:13 +01:00
Paul Jensen
da7835d5c3 am 576fc3ca: am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 
* commit '576fc3ca6bdd5ffe606d3e36f6b8114530642d3e':
  Flush HTTP socket pools and DNS cache when binding process to a Network.
 2014-09-11 13:34:08 +00:00
Paul Jensen
f4f38caa29 am 09ff9d7e: am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 
* commit '09ff9d7e9823accbee65f3e44be13e8e7d9d5842':
  Make Network.openConnection() share HttpHandlers not OkHttpClients.
 2014-09-11 13:17:47 +00:00
Paul Jensen
204dc65f37 Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 2014-09-11 13:15:22 +00:00
Paul Jensen
5236971bbf Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 2014-09-11 12:57:33 +00:00
Alan Viverette
bc57a08f5f am 5f9ce5e9: am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 
* commit '5f9ce5e98322d328e6b0628875f73aa688a71c9e':
  Use Calendar day of week rather than Time in SimpleMonthView
 2014-09-11 01:57:20 +00:00
Svetoslav Ganov
4165e500f6 am b6e7e347: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev 
* commit 'b6e7e347c15db664411aa6d369314ae396d4c65b':
  Using the correct package name for ContentResolver
 2014-09-11 01:57:14 +00:00
Alan Viverette
0c1964e76d Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 2014-09-11 01:22:55 +00:00
Svetoslav Ganov
b1467faa23 Merge "Using the correct package name for ContentResolver" into lmp-dev 2014-09-11 01:21:21 +00:00
Dianne Hackborn
4bde299148 am 14a0ec03: am 022cfcda: Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev 
* commit '14a0ec0324a9aa5ce7bc2c767c744092fd128143':
  Fix issue #17414533: update batterystats occasionally takes a couple...
 2014-09-11 01:18:16 +00:00
Dianne Hackborn
24d8c17bdb am f6f453d1: am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 
* commit 'f6f453d1baa77d3bed97936ffbe177d15055c8e8':
  Fix issue #17428001: Fix revokeUriPermissions
 2014-09-11 01:18:09 +00:00
Lajos Molnar
40449c70d6 am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit 'b9414beb66ef9ca14bc606256f3af781c8124901':
  add android.util.SizeF.parseSizeF()
 2014-09-11 01:18:01 +00:00
Dianne Hackborn
023b6812ab Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev 2014-09-11 00:56:41 +00:00
Dianne Hackborn
547f6e1803 Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 2014-09-11 00:55:25 +00:00
Lajos Molnar
5b54c9fb2a Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 2014-09-11 00:55:06 +00:00
Matthew Williams
03a4da6e8e Add flag to JobParameters for job expired 
BUG: 17424511
Introduce an "isOverrideDeadlineExpired" which will allow clients
to know when they are being run due to an expiry.
Nb that we check deadline expiry by checking that the constraints on
the job are not satisfied at execution time. Really this is the same
thing, as a job will not be run without its constraints being met,
unless the job has expired.

Change-Id: I4b91e5b5eadccabd91296d5a5ca66b859dbfaf5c
 2014-09-10 17:32:18 -07:00
Paul Jensen
07ed07459a Make Network.openConnection() share HttpHandlers not OkHttpClients. 
HttpHandler and HttpsHandler classes have a lot of bug fixes baked into
them that the Network.openConnection() API should be using, for example
disabling SPDY support.

bug:17420465
Change-Id: I9f1472753a542d1dd6bffde3a60c37a9145098aa
 2014-09-11 00:25:50 +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
Yigit Boyar
e91f7c0219 Add support for default content description in DecorToolbar 
Bug: 16888338
Change-Id: I0f3f8fcd39cfd29d239801392dd712869749aecf
 2014-09-10 17:12:28 -07:00