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

71504 Commits

Author SHA1 Message Date
Jorim Jaggi
4bb01f1b11 am ecfeefb4: am f7f90276: am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev 
* commit 'ecfeefb483a7a7ab33aae22ae85ccbdaa3a68522':
  Fix API review: Camera prewarm
  lock device orientation during app compatibility test
  Fix reconfigure & setPremult alpha handling
  Unflip TextureView getBitmap readback
  Handle error states when refreshing accessibility node
 2015-06-02 23:05:36 +00:00
Jorim Jaggi
1059e82161 am 8c981908: am 311f8a7c: am 11accf51: Merge "Make sure starting windows only draw once" into mnc-dev 
* commit '8c981908983532484dc9c829a8b7f1535bae34d4':
  Make sure starting windows only draw once
 2015-06-02 23:05:31 +00:00
Jorim Jaggi
ecfeefb483 am f7f90276: am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev 
* commit 'f7f90276a1f262c0db855edc49d544e157bc6e7f':
  Fix API review: Camera prewarm
  lock device orientation during app compatibility test
  Fix reconfigure & setPremult alpha handling
  Unflip TextureView getBitmap readback
  Handle error states when refreshing accessibility node
 2015-06-02 22:49:06 +00:00
Jorim Jaggi
8c98190898 am 311f8a7c: am 11accf51: Merge "Make sure starting windows only draw once" into mnc-dev 
* commit '311f8a7cb0196d3a49a0f600856671193974b5ed':
  Make sure starting windows only draw once
 2015-06-02 22:49:00 +00:00
Nicolas Prevot
ca595cf8f3 am 8a4dbac5: am 83366d50: am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 
* commit '8a4dbac59894a7dab930b52f3f0d8c6826eef2c4':
  Make ACTION_PROVISION_MANAGED_DEVICE public.
 2015-06-02 22:46:59 +00:00
Svetoslav
0279868fa8 am c87f485d: am 7c773529: am 3aa3f5f8: Merge "Fix java doc" into mnc-dev 
* commit 'c87f485da5e94d8b9fce5295c2b4ca528bc206db':
  Fix java doc
 2015-06-02 22:46:54 +00:00
Jorim Jaggi
f7f90276a1 am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev 
* commit '7d01d2c6cfcdfad74735619ab95f8396be54dc0f':
  Fix API review: Camera prewarm
  lock device orientation during app compatibility test
  Fix reconfigure & setPremult alpha handling
  Unflip TextureView getBitmap readback
  Handle error states when refreshing accessibility node
 2015-06-02 22:39:49 +00:00
Jorim Jaggi
311f8a7cb0 am 11accf51: Merge "Make sure starting windows only draw once" into mnc-dev 
* commit '11accf51c2e5b3e4fcfc3d61e9b8a46c1ce0284a':
  Make sure starting windows only draw once
 2015-06-02 22:39:45 +00:00
Svetoslav
f81b973687 am 12e7abc6: am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 
* commit '12e7abc65971832285c873aa78d9b08d862f7d70':
  Add API to hint whether to show on-board UI before a permission request.
 2015-06-02 22:28:59 +00:00
Nicolas Prevot
8a4dbac598 am 83366d50: am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 
* commit '83366d500f48f73b8465c7e6cbe83c7a5aa91bbe':
  Make ACTION_PROVISION_MANAGED_DEVICE public.
 2015-06-02 22:28:46 +00:00
Svetoslav
c87f485da5 am 7c773529: am 3aa3f5f8: Merge "Fix java doc" into mnc-dev 
* commit '7c773529afeff7d88386045c75b1eab994ae4ea9':
  Fix java doc
 2015-06-02 22:28:42 +00:00
Jorim Jaggi
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +00:00
Jorim Jaggi
11accf51c2 Merge "Make sure starting windows only draw once" into mnc-dev 2015-06-02 22:24:48 +00:00
Nicolas Prevot
83366d500f am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 
* commit 'db6ac0e912ee935f848b4d5bede02f1f6df9e3e2':
  Make ACTION_PROVISION_MANAGED_DEVICE public.
 2015-06-02 22:18:31 +00:00
Svetoslav
7c773529af am 3aa3f5f8: Merge "Fix java doc" into mnc-dev 
* commit '3aa3f5f892017f8a3799278c0cee8773dd4c5a0f':
  Fix java doc
 2015-06-02 22:18:27 +00:00
Svetoslav
12e7abc659 am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 
* commit '703c7f9e776bb900f19c4dc30c03c6a22c833aba':
  Add API to hint whether to show on-board UI before a permission request.
 2015-06-02 22:15:46 +00:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Svetoslav
3aa3f5f892 Merge "Fix java doc" into mnc-dev 2015-06-02 22:09:18 +00:00
Svetoslav
aa048b6242 Fix java doc 
Change-Id: I927a1766e1e4cac99d0d7999fef568b82af769af
 2015-06-02 15:08:48 -07:00
Svetoslav
703c7f9e77 am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 
* commit 'c5ff0020a2467e0b7aed590d790b5a1b4b082f56':
  Add API to hint whether to show on-board UI before a permission request.
 2015-06-02 22:02:39 +00:00
Svetoslav
c5ff0020a2 Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 2015-06-02 21:53:20 +00:00
Svetoslav
20770ddbd4 Add API to hint whether to show on-board UI before a permission request. 
bug:21511988

Change-Id: I9d1d7adf34b68074e65510f53b6e642cf784cf6b
 2015-06-02 14:48:38 -07:00
Brian Attwell
df336c9064 am 6b37b0df: am 03c818b5: am b36ad5dc: Decouple ProviderStatus & internal provider state 
* commit '6b37b0df1102f0f7f3336638a68defba197d1910':
  Decouple ProviderStatus & internal provider state
 2015-06-02 21:27:59 +00:00
Amith Yamasani
982c0d9d4d am 9984f181: am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev 
* commit '9984f181c5d0ed933837e548a97729ae81b5e4dd':
  Temporarily whitelist an app for network during doze
 2015-06-02 21:27:36 +00:00
Adrian Roos
9d1dbd7e1c am ca00a958: am 25d36c66: am 3546c61b: Remove obsolete symbols 
* commit 'ca00a95863c1753e47675a0c7140df16297243d9':
  Remove obsolete symbols
 2015-06-02 21:27:25 +00:00
Robin Lee
afbf476283 am 9aa90541: am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev 
* commit '9aa905416931860cd92364aa2453c6a859785b2e':
  Device policy: consistent javadoc and annotations
 2015-06-02 21:27:19 +00:00
Wale Ogunwale
f306ae7260 am be86841c: am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev 
* commit 'be86841c64ea0d1b67bd77c0a5687729bc521b27':
  @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
 2015-06-02 21:26:41 +00:00
Robin Lee
61ffa153ec am 24613fae: am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev 
* commit '24613fae6b82456837ab8e5d495fdf88a336ce52':
  Revert "Consistent documentation and annotations for DPMS"
 2015-06-02 21:26:30 +00:00
Robin Lee
45b5675d4c am b9555129: am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev 
* commit 'b95551290a61c1a1b2cbc494055cdcd0f681e060':
  Consistent documentation and annotations for DPMS
 2015-06-02 21:26:24 +00:00
Brian Attwell
6b37b0df11 am 03c818b5: am b36ad5dc: Decouple ProviderStatus & internal provider state 
* commit '03c818b575c9f4481fee3ceaf21ac07540a69619':
  Decouple ProviderStatus & internal provider state
 2015-06-02 21:16:41 +00:00
Amith Yamasani
9984f181c5 am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev 
* commit '52f26b6399cd28bfaa5822cb4c3a5340404f7800':
  Temporarily whitelist an app for network during doze
 2015-06-02 21:10:40 +00:00
Adrian Roos
ca00a95863 am 25d36c66: am 3546c61b: Remove obsolete symbols 
* commit '25d36c66f4b319747feed7a2c98d989924403df1':
  Remove obsolete symbols
 2015-06-02 21:10:23 +00:00
Robin Lee
9aa9054169 am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev 
* commit '805402de76dc983b2b785d77531f81ab6eea5f87':
  Device policy: consistent javadoc and annotations
 2015-06-02 21:10:18 +00:00
Wale Ogunwale
be86841c64 am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev 
* commit '28e00af912154849c7e2bc592e16ee77155038e3':
  @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
 2015-06-02 21:09:30 +00:00
Robin Lee
24613fae6b am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev 
* commit 'b35307343a72a24165e8adceec2fba8222ef86eb':
  Revert "Consistent documentation and annotations for DPMS"
 2015-06-02 21:09:09 +00:00
Robin Lee
b95551290a am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev 
* commit '9b286dd637775d157b273cdb8dfec9e83af5c050':
  Consistent documentation and annotations for DPMS
 2015-06-02 21:09:03 +00:00
Brian Attwell
03c818b575 am b36ad5dc: Decouple ProviderStatus & internal provider state 
* commit 'b36ad5dc6bb6218aeabca17197001ac0a942219a':
  Decouple ProviderStatus & internal provider state
 2015-06-02 21:05:13 +00:00
Nicolas Prevot
64bf7b2870 Make ACTION_PROVISION_MANAGED_DEVICE public. 
Also remove the doc saying that factory reset is impossible if there
is a device owner: the device owner may not set the user restriciton
DISALLOW_FACTORY_RESET.

BUG:19889110

Change-Id: Iadc084a38e541061c0b0c95bfc95da73d48842d7
 2015-06-02 14:04:41 -07:00
Brian Attwell
b36ad5dc6b Decouple ProviderStatus & internal provider state 
Bug: 21090207
Change-Id: I7e93e36ad0c0d667ac56983c76acb1b97bd8755c
 2015-06-02 20:56:27 +00:00
Amith Yamasani
52f26b6399 am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev 
* commit 'ff3b76d04672d09214cd0ceb29ec548c8abb2330':
  Temporarily whitelist an app for network during doze
 2015-06-02 20:49:57 +00:00
Amith Yamasani
ff3b76d046 Merge "Temporarily whitelist an app for network during doze" into mnc-dev 2015-06-02 20:34:59 +00:00
Carlos Valdivia
de326e63fa am e3f430e1: am 2ca50571: am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev 
* commit 'e3f430e1dc56037699ae63585cbe3b5787aa9519':
  System Health: Support expiring tokens
 2015-06-02 20:32:58 +00:00
Wei Wang
7e1fa88e0e am 4db77feb: am 96195285: am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev 
* commit '4db77febac5ffba9c5581d149524c3e8d760b711':
  Expose a few system APIs for BLE scan only mode.
 2015-06-02 20:32:49 +00:00
Svet Ganov
ad602c3c82 am 0f7f72da: am a332605f: am 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering." into mnc-dev 
* commit '0f7f72dae6fc6cdae5a668baff16d605fd140c7b':
  Respect accessibility importance for before/after node ordering.
 2015-06-02 20:32:35 +00:00
Alan Viverette
88dba6c893 am e18cfd39: am 0693b7c4: am 54310008: Merge "Remove strict mode violation from value to string coercion" into mnc-dev 
* commit 'e18cfd3954ccc75b9c881528c5468d99c9f242f1':
  Remove strict mode violation from value to string coercion
 2015-06-02 20:32:30 +00:00
Adrian Roos
25d36c66f4 am 3546c61b: Remove obsolete symbols 
* commit '3546c61b27eee218fc37581a3e0229b8646eb119':
  Remove obsolete symbols
 2015-06-02 20:08:43 +00:00
Robin Lee
805402de76 am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev 
* commit '02a400ca6e5a185906b743c379716f9315e03bb2':
  Device policy: consistent javadoc and annotations
 2015-06-02 20:02:07 +00:00
Adrian Roos
3546c61b27 Remove obsolete symbols 
Change-Id: I8e95e82ef4f954376c57685df80184416d579fe5
 2015-06-02 19:56:11 +00:00
Robin Lee
02a400ca6e Merge "Device policy: consistent javadoc and annotations" into mnc-dev 2015-06-02 19:53:41 +00:00
Nitin Shivpure
19e72a689d am 39e04519: am 305c1941: am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing 
* commit '39e04519ca1ecfa2c005394e50e2549979627b7c':
  Bluetooth: Fix to avoid framework reboot during monkey testing
 2015-06-02 19:23:47 +00:00