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

52153 Commits

Author SHA1 Message Date
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
Clara Bayarri
b4f4d73ad2 am 127702e2: am f47edadd: am 99bd704f: Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mnc-dev 
* commit '127702e24a99a39c24ca9b4def85441c1ceba908':
  Fix Floating Toolbar appearing after ActionMode was cancelled
 2015-05-13 16:33:46 +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
Clara Bayarri
127702e24a am f47edadd: am 99bd704f: Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mnc-dev 
* commit 'f47edaddba33238e0978266f4910263899d0d1e9':
  Fix Floating Toolbar appearing after ActionMode was cancelled
 2015-05-13 16:22:08 +00:00
Clara Bayarri
99bd704f1c Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mnc-dev 2015-05-13 15:46:59 +00:00
Brian Colonna
c42362f5d3 am 5cfcaac3: am 0e232a66: am 9a61013d: Merge "Removed unused Face Unlock aidl files" into mnc-dev 
* commit '5cfcaac302638b6ec9f804af8c7c0d79af55636d':
  Removed unused Face Unlock aidl files
 2015-05-13 15:39:08 +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
Brian Colonna
5cfcaac302 am 0e232a66: am 9a61013d: Merge "Removed unused Face Unlock aidl files" into mnc-dev 
* commit '0e232a667c7e201a1d94a88b967a02c77eba6705':
  Removed unused Face Unlock aidl files
 2015-05-13 15:28:02 +00:00
Erik Kline
711499ff70 am 636b4b17: am cf304fb3: Merge "Initial IpReachabilityMonitor implementation." into mnc-dev 
* commit '636b4b174405637cf236a1ee9fff9953c6e11275':
  Initial IpReachabilityMonitor implementation.
 2015-05-13 15:27:58 +00:00
Clara Bayarri
0d7d4ef560 Fix Floating Toolbar appearing after ActionMode was cancelled 
The Views created for the Toolbar were not cleaned up properly when the
mode was cancelled by the client in onCreateActionMode, leading to the
toolbar appearing over other views when it shouldn't due to
onWindowFocusChanged showing the Toolbar if it exists.

We don't actually need the views if we don't know whether they are
going to be shown yet, so moved view creation to after onCreateActionMode

Bug: 20713912
Change-Id: Ic0c31d1634e1e96d9981a77b2c769306a8bf1a8d
 2015-05-13 16:03:14 +01:00
Brian Colonna
9a61013d2d Merge "Removed unused Face Unlock aidl files" into mnc-dev 2015-05-13 13:27:15 +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
be26176150 am 6ca83aab: am ebc45669: Merge "Improve documentation and rename insertVisualStateCallback to postVisualStateCallback." into mnc-dev 
* commit '6ca83aab2c33ac49c64b2a6b649aafbaca5d8653':
  Improve documentation and rename insertVisualStateCallback to postVisualStateCallback.
 2015-05-13 11:53:40 +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
fca0cc93ba am 9a3cdadb: am 5a5745b3: Merge "Add basic netlink library code." into mnc-dev 
* commit '9a3cdadb4cb79a3ab0e2a9ea3ba2365b5942ca34':
  Add basic netlink library code.
 2015-05-13 07:25:33 +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
89cc4809c8 am 002540f6: am 44b4add4: Merge "New "sm" shell tool to call StorageManager." into mnc-dev 
* commit '002540f6ee61fa787682251980efbe1f6ea73cae':
  New "sm" shell tool to call StorageManager.
 2015-05-13 05:50:05 +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
Fabrice Di Meglio
dbd83618a3 am 12aa8471: am a5c24e3b: Merge "Add IntentFilter auto verification - part 9" into mnc-dev 
* commit '12aa8471cc68ae4ade25db94bfdbe197be296b67':
  Add IntentFilter auto verification - part 9
 2015-05-13 02:13:57 +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
4a786a1fde am 16e03c33: am 94fa0387: Merge "Add a temporary wrapper for ViewStructure until Webview APK is updated" into mnc-dev 
* commit '16e03c33171323fc75f2640465e9c49b629b072f':
  Add a temporary wrapper for ViewStructure until Webview APK is updated
 2015-05-13 01:41:57 +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
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
e4be40fe0a am 8d9f0790: am 221ffb26: Merge "Runtime permissions for system components not revokable - framework" into mnc-dev 
* commit '8d9f079002e55ca872ec294eae5f524657746438':
  Runtime permissions for system components not revokable - framework
 2015-05-13 00:32:56 +00:00
Ruben Brunk
a5eea272be am af1757ff: am 4143fbcf: Merge "camera2: Fix crop selection in LEGACY." into mnc-dev 
* commit 'af1757ffd619480f4b231b4e545ddfa769ac36dd':
  camera2: Fix crop selection in LEGACY.
 2015-05-13 00:32:41 +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
Adam Powell
3d26822447 am bad22506: am 8c6cd908: Merge "Apply API feedback for ChooserTarget" into mnc-dev 
* commit 'bad225069c719dc5c802fd758a4dd18acac1a2c4':
  Apply API feedback for ChooserTarget
 2015-05-13 00:13:21 +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
Alan Viverette
32440f6818 am 6276bdce: am c25771ce: Merge "Update scrollIndicators XML enums to match View constants" into mnc-dev 
* commit '6276bdce30009b1a12b6ce94ec8465ec694ee0c7':
  Update scrollIndicators XML enums to match View constants
 2015-05-12 23:55:07 +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
Alan Viverette
a789325a0f Update scrollIndicators XML enums to match View constants 
Bug: 21027462
Change-Id: I41e503e218253cf63bc44a82345f8b086261e379
 2015-05-12 16:25:47 -07:00
Roozbeh Pournader
e652d17b3e am 703b5078: am 0ca0f580: Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev 
* commit '703b507854a54229133bd4ef9289aedbbc2bb457':
  Add hyphenationFrequency attribute to TextView and StaticLayout.
 2015-05-12 23:21:59 +00:00
Roozbeh Pournader
0ca0f58000 Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev 2015-05-12 22:59:47 +00:00
Jeff Sharkey
7d2af54a98 New "sm" shell tool to call StorageManager. 
Surface basic StorageManager commands through shell tool, like
simple listing of disks and volumes, and commands like mounting and
partitioning.

The output is designed to be parsed by host-side testing tools,
instead of relying on fragile dumpsys parsing.

Bug: 19993667
Change-Id: I993e92ecf57996678965945f0ae648b392a77ea2
 2015-05-12 15:52:43 -07:00