Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
193,428 Commits 3 Branches 0 Tags
f98ee061106dba26280792bc63352e5653906f8d
Commit Graph

47946 Commits

Author SHA1 Message Date
John Spurlock
f98ee06110 am fe4b8433: am 9e957b1b: am fb13d497: Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev 
* commit 'fe4b843390b13429022a5ac0f661dcc573ff7fa6':
  Zen: Use shorter version of countdown condition summary in footer.
 2015-05-13 20:42:12 +00:00
Jeff Sharkey
9e9c24333e am 7930df19: am c4febd4c: am 2817f22d: Merge "Hide API not ready for prime time." into mnc-dev 
* commit '7930df190ae19a665852e1ea5b047145889c878a':
  Hide API not ready for prime time.
 2015-05-13 20:42:07 +00:00
Jeff Sharkey
ed8e71e03d am b26b17a7: am 276671a3: am 4af455be: Merge "Rewriting should fail when any paths are null." into mnc-dev 
* commit 'b26b17a7c5494be14b885f179e85350efb8daa86':
  Rewriting should fail when any paths are null.
 2015-05-13 20:13:32 +00:00
John Spurlock
fb13d497ae Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev 2015-05-13 20:10:49 +00:00
Jeff Sharkey
2817f22d15 Merge "Hide API not ready for prime time." into mnc-dev 2015-05-13 20:08:13 +00:00
Jeff Sharkey
f85ac77f0c Hide API not ready for prime time. 
Bug: 20642684
Change-Id: I133f023ba7d1d9572175a8f6a3e3c8314c5a897d
 2015-05-13 13:07:29 -07:00
John Spurlock
bbde26774f Zen: Use shorter version of countdown condition summary in footer. 
To try and keep to two-lines.

Bug: 21119801
Change-Id: I5a6760381a6b673b8481164f92cf6b7b236af349
 2015-05-13 15:45:40 -04:00
Jeff Sharkey
4af455beb7 Merge "Rewriting should fail when any paths are null." into mnc-dev 2015-05-13 19:39:26 +00:00
Jeff Sharkey
41be35dd01 Rewriting should fail when any paths are null. 
Bug: 21017105
Change-Id: I0c5e9c5bdf397d51e2799b06a52bc5bd0bdd09b0
 2015-05-13 12:38:16 -07:00
Jonathan Basseri
b105d967c0 am 4df9a6b7: am 20d14fe3: am c69cd0bf: Merge "Switching to PersistableBundle in carrier config API." into mnc-dev 
* commit '4df9a6b73d3db5a7969da67e0df82bd24e9da2b3':
  Switching to PersistableBundle in carrier config API.
 2015-05-13 18:23:13 +00:00
Nicolas Prevot
323fb254ae am a428fabc: am a09f296c: am 22fec220: Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev 
* commit 'a428fabc09e43a5cd1bb6e8edda546ee917f49dd':
  Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.
 2015-05-13 18:23:08 +00:00
Jonathan Basseri
4df9a6b73d am 20d14fe3: am c69cd0bf: Merge "Switching to PersistableBundle in carrier config API." into mnc-dev 
* commit '20d14fe3a753c7bfbb2b471c853fddfe8740d593':
  Switching to PersistableBundle in carrier config API.
 2015-05-13 18:11:05 +00:00
Nicolas Prevot
a428fabc09 am a09f296c: am 22fec220: Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev 
* commit 'a09f296c0d6cd6f562391991a51e0a3d5c6356b7':
  Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.
 2015-05-13 18:10:59 +00:00
Mady Mellor
56ce4f6a18 am 15398fae: am 4241e307: am 21623faa: Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev 
* commit '15398faeb0482c39075718d70f065ff33d01a2ce':
  Fix issue where handle is in front of word rather than end of word
 2015-05-13 18:05:27 +00:00
Chad Brubaker
83ce095c84 Add keystore onUserAdded/Removed methods 
(cherry-picked from commit 31c2897105)

Change-Id: I73fe9344ec5660e58425d5c85d14381820533d57
 2015-05-13 10:57:42 -07:00
Mady Mellor
15398faeb0 am 4241e307: am 21623faa: Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev 
* commit '4241e3076f5c903a5ed3ebf00999019ab5ef6c70':
  Fix issue where handle is in front of word rather than end of word
 2015-05-13 17:52:40 +00:00
Jonathan Basseri
c69cd0bf75 Merge "Switching to PersistableBundle in carrier config API." into mnc-dev 2015-05-13 17:46:32 +00:00
Nicolas Prevot
22fec2201f Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev 2015-05-13 17:46:05 +00:00
Jonathan Basseri
4f9ad1678e Switching to PersistableBundle in carrier config API. 
Part of this API involves persisting config bundles to avoid binding to
apps at critical moments (like boot). Regular bundles should not be
written to disk because they support object types that can lose their
meaning while the data is at rest.

In order to use PersistableBundle, we must either start with one or
filter unwanted types out of Bundle objects. Since the carrier config
API has no use for unsupported types, we chose to use PersistableBundle
everywhere.

Bug: 20268926
Change-Id: I17989ce840014c2a0ed3679c1bca5a8498082c7f
 2015-05-13 10:45:29 -07:00
Mady Mellor
21623faa44 Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev 2015-05-13 17:34:13 +00:00
Chad Brubaker
04d985105e am 2b77ab78: am 875607d9: Merge "Add keystore onUserAdded/Removed methods" 
* commit '2b77ab7835cd226ce52a3acfca36525e0c4998e4':
  Add keystore onUserAdded/Removed methods
 2015-05-13 17:00:51 +00:00
Chad Brubaker
2b77ab7835 am 875607d9: Merge "Add keystore onUserAdded/Removed methods" 
* commit '875607d97fe15eaa625efaa20b0bdbd977f07d93':
  Add keystore onUserAdded/Removed methods
 2015-05-13 16:32:24 +00:00
Erik Kline
b9e1654ed9 am 711499ff: am 636b4b17: am cf304fb3: Merge "Initial IpReachabilityMonitor implementation." into mnc-dev 
* commit '711499ff704334e1bb83046d4308a8eb2e60c329':
  Initial IpReachabilityMonitor implementation.
 2015-05-13 15:39:03 +00:00
Erik Kline
cf304fb35c Merge "Initial IpReachabilityMonitor implementation." into mnc-dev 2015-05-13 13:11:13 +00:00
Erik Kline
787d935611 Initial IpReachabilityMonitor implementation. 
Add a class that monitors on-link IP reachability and notifies
callers whenever any on-link addresses of interest appear to have
become unresponsive.

Bug: 18581716
Change-Id: I333eee6fe30fa97a21297c6745de14ceb95bb661
 2015-05-13 21:36:15 +09:00
Tobias Sargeant
3bd804ac71 am be261761: am 6ca83aab: am ebc45669: Merge "Improve documentation and rename insertVisualStateCallback to postVisualStateCallback." into mnc-dev 
* commit 'be26176150a36f008e66ead33fd651e49b3aee9f':
  Improve documentation and rename insertVisualStateCallback to postVisualStateCallback.
 2015-05-13 12:04:25 +00:00
Tobias Sargeant
ebc456691e Merge "Improve documentation and rename insertVisualStateCallback to postVisualStateCallback." into mnc-dev 2015-05-13 11:33:18 +00:00
Tobias Sargeant
b365604977 Improve documentation and rename insertVisualStateCallback to postVisualStateCallback. 
Bug: 21043955
Change-Id: I077cad68fb519581387d1b474f27d43222f68e3b
 2015-05-13 11:23:57 +01:00
Erik Kline
70bc35c4f7 am fca0cc93: am 9a3cdadb: am 5a5745b3: Merge "Add basic netlink library code." into mnc-dev 
* commit 'fca0cc93ba59d9b80de41de315eb9fd137fdbfdd':
  Add basic netlink library code.
 2015-05-13 07:36:45 +00:00
Erik Kline
5a5745b30c Merge "Add basic netlink library code." into mnc-dev 2015-05-13 07:05:00 +00:00
Erik Kline
6193aa3305 Add basic netlink library code. 
Add netlink socket helpers and parsing code for basic netlink messages.
Additionally, support from some neighbor discovery -specific messages
is included.

Bug: 18581716
Change-Id: Ib2aa924222b63cdbebf09a8bf8ff35ee24269fc5
 2015-05-13 15:18:39 +09:00
Jeff Sharkey
385e6dfd9e am 89cc4809: am 002540f6: am 44b4add4: Merge "New "sm" shell tool to call StorageManager." into mnc-dev 
* commit '89cc4809c82538344aacdba7df882749b2f782de':
  New "sm" shell tool to call StorageManager.
 2015-05-13 06:00:35 +00:00
Jeff Sharkey
44b4add4ce Merge "New "sm" shell tool to call StorageManager." into mnc-dev 2015-05-13 05:27:30 +00:00
Fabrice Di Meglio
b083f9f91d am dbd83618: am 12aa8471: am a5c24e3b: Merge "Add IntentFilter auto verification - part 9" into mnc-dev 
* commit 'dbd83618a3d5fe3a2ad5326f703a34013bb39821':
  Add IntentFilter auto verification - part 9
 2015-05-13 02:23:00 +00:00
Selim Gurun
8a92a48ed6 am 4a786a1f: am 16e03c33: am 94fa0387: Merge "Add a temporary wrapper for ViewStructure until Webview APK is updated" into mnc-dev 
* commit '4a786a1fdeff49f5d7dac56889a980cef0663418':
  Add a temporary wrapper for ViewStructure until Webview APK is updated
 2015-05-13 01:55:01 +00:00
Fabrice Di Meglio
a5c24e3bfe Merge "Add IntentFilter auto verification - part 9" into mnc-dev 2015-05-13 01:53:08 +00:00
Selim Gurun
94fa03876e Merge "Add a temporary wrapper for ViewStructure until Webview APK is updated" into mnc-dev 2015-05-13 01:23:52 +00:00
Nicolas Prevot
ebe2d99160 Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED. 
In the html doc, it showed up as (@see #ACTION_PROVISION_MANAGED_PROFILE).

Change-Id: I4b3eec26525c6bd87319296f4bb89d037dfc3d03
 2015-05-12 18:17:17 -07:00
Selim Gurun
0b408586c6 Add a temporary wrapper for ViewStructure until Webview APK is updated 
It turned out that after the API change from ViewAssistStructure to
ViewStructure, the suggested mechanism did not work, and webview
started throwing abstractmethoderror exceptions. Temporarily
solve the problem by wrapping ViewStructure inside a
ViewAssistStructure. Once Webview APK is updated, drop it.

Change-Id: I09dfe7dac9c2bc7c037d842844c61dd879629470
 2015-05-12 18:06:59 -07:00
Svet Ganov
7a706ae249 am e4be40fe: am 8d9f0790: am 221ffb26: Merge "Runtime permissions for system components not revokable - framework" into mnc-dev 
* commit 'e4be40fe0aaa02f757b451fbf08fea0f1d2b0035':
  Runtime permissions for system components not revokable - framework
 2015-05-13 00:44:32 +00:00
Ruben Brunk
fe59861182 am a5eea272: am af1757ff: am 4143fbcf: Merge "camera2: Fix crop selection in LEGACY." into mnc-dev 
* commit 'a5eea272bea4d3b61a0a171402c564f5a652a06d':
  camera2: Fix crop selection in LEGACY.
 2015-05-13 00:44:17 +00:00
Adam Powell
7483c85325 am 3d268224: am bad22506: am 8c6cd908: Merge "Apply API feedback for ChooserTarget" into mnc-dev 
* commit '3d2682244766cc69d00a48b6b36daa0974e1dc95':
  Apply API feedback for ChooserTarget
 2015-05-13 00:34:43 +00:00
Svet Ganov
221ffb2662 Merge "Runtime permissions for system components not revokable - framework" into mnc-dev 2015-05-13 00:17:46 +00:00
Ruben Brunk
4143fbcfa8 Merge "camera2: Fix crop selection in LEGACY." into mnc-dev 2015-05-13 00:09:50 +00:00
Alan Viverette
39155a9b68 am 32440f68: am 6276bdce: am c25771ce: Merge "Update scrollIndicators XML enums to match View constants" into mnc-dev 
* commit '32440f68182d820f51ee4bc796849ba4b1bcb627':
  Update scrollIndicators XML enums to match View constants
 2015-05-13 00:08:03 +00:00
Fabrice Di Meglio
ef741da4d4 Add IntentFilter auto verification - part 9 
- make verifyIntentFilter(int, int, List<String>) a SystemApi

See bug #19628271

Change-Id: I8b1f29da385867beb8b19829c124db1821450c41
 2015-05-12 16:58:30 -07:00
Adam Powell
8c6cd9088e Merge "Apply API feedback for ChooserTarget" into mnc-dev 2015-05-12 23:57:32 +00:00
Svet Ganov
b3f22b48bb Runtime permissions for system components not revokable - framework 
Change-Id: I5b1d7bb1618ffa8d1231618ece47d0905c82f7bf
 2015-05-12 16:49:19 -07:00
Roozbeh Pournader
35a85ab057 am e652d17b: am 703b5078: am 0ca0f580: Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev 
* commit 'e652d17b3e8af3c4e8e3355cca864e61aad0dc35':
  Add hyphenationFrequency attribute to TextView and StaticLayout.
 2015-05-12 23:37:51 +00:00
Alan Viverette
c25771ce22 Merge "Update scrollIndicators XML enums to match View constants" into mnc-dev 2015-05-12 23:34:15 +00:00