Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
309,172 Commits 3 Branches 0 Tags
da70ca69fdb5ea80fb064e8a48cbfa5b74bcff45
Commit Graph

309172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
99695b0fc9 Merge "Save deleted channels." 2017-01-20 14:30:20 +00:00
Joachim Sauer
c67148da85 Expose more ICU4J APIs. 
Expose more classes/methods, mostly those added in ICU4J 57.

Additionally EthiopicCalendar is now un-hidden which was hidden
accidentally and should have been in N.

Bug: 30825380
Test: m checkapi
Change-Id: Ib3bea26a9b246401d33cc0ccc0f91768d1fe1286
 2017-01-20 14:06:09 +00:00
TreeHugger Robot
65b052713c Merge "Prepare for removal of legacy-test from default targets" 2017-01-20 13:32:05 +00:00
TreeHugger Robot
cc9224c8d4 Merge "Adding app op and intent action for external sources" 2017-01-20 12:08:20 +00:00
Jorim Jaggi
e47d2cd415 Merge "Persist task snapshots to disk" 2017-01-20 11:46:13 +00:00
Suprabh Shukla
2f34b1a678 Adding app op and intent action for external sources 
Added an app op to control which package and uid can install apps on the
device and an intent action to launch the settings fragment.

Test: Will include in follow up CL, tracked in b/33792674

Bug: 31002700
Change-Id: Ic073495759d9867f8001a6c712e402398c53dfc9
 2017-01-20 02:39:08 -08:00
Erik Kline
bcd68cf520 Merge "Refactor to SimChangeListener class" am: a12217012e am: 74247b4ee8 am: 6dacd5ecf2 
am: dc81bd74ae

Change-Id: Ifa36726ce67fd81ca508d5530b815f5e82557a89
 2017-01-20 10:25:22 +00:00
Erik Kline
dc81bd74ae Merge "Refactor to SimChangeListener class" am: a12217012e am: 74247b4ee8 
am: 6dacd5ecf2

Change-Id: Ia80e64c9f1188953aa4d9687bc7b0b0659de968a
 2017-01-20 10:21:20 +00:00
Erik Kline
b7200f92fa Merge "Address comments from previous change (320592)" am: e7cb6c3761 am: b6f606b59f am: 454a408717 
am: 430b1ff0f0

Change-Id: I488ec47172c48f2965b33fc484a26f395aa48a29
 2017-01-20 10:18:52 +00:00
Erik Kline
6dacd5ecf2 Merge "Refactor to SimChangeListener class" am: a12217012e 
am: 74247b4ee8

Change-Id: I59dc854bd74eb8ba6addae90a4a87453868b5368
 2017-01-20 10:16:56 +00:00
Erik Kline
430b1ff0f0 Merge "Address comments from previous change (320592)" am: e7cb6c3761 am: b6f606b59f 
am: 454a408717

Change-Id: I374c8c63e4fb3310c3c50cc531a65005991c2fe2
 2017-01-20 10:14:50 +00:00
Erik Kline
35eee13df4 Address a few unittest comments. 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Change-Id: I8f6002243031dceff60b3d6d377b9e25f239eb23
 2017-01-20 19:13:20 +09:00
Erik Kline
74247b4ee8 Merge "Refactor to SimChangeListener class" 
am: a12217012e

Change-Id: I863f0b23251a0ebd18a76cf08e1ff0f2cee9cda3
 2017-01-20 10:13:08 +00:00
Erik Kline
3e7566572e Move several config elements into TetheringConfiguration class 
Encapsulate the following config elements:
    - all interface name regular expressions
    - specification of preferred upstreams
    - downstream DHCPv4 ranges
    - default IPv4 (and IPv6) DNS servers

Test: as follows
    - builds
    - flashed (bullhead)
    - runtest frameworks-net passes
Bug: 32163131
Change-Id: Ife4871c0b89d2d52e2cc9238e0606b428287521c
 2017-01-20 19:12:38 +09:00
Erik Kline
454a408717 Merge "Address comments from previous change (320592)" am: e7cb6c3761 
am: b6f606b59f

Change-Id: Icc5aa3d6cafd9829e65a0e82523727a9aba4ade5
 2017-01-20 10:10:52 +00:00
Treehugger Robot
a12217012e Merge "Refactor to SimChangeListener class" 2017-01-20 10:05:51 +00:00
Erik Kline
b6f606b59f Merge "Address comments from previous change (320592)" 
am: e7cb6c3761

Change-Id: I3266a02a4a2fd76c4bb2f1a744103add63307e26
 2017-01-20 10:04:51 +00:00
Treehugger Robot
e7cb6c3761 Merge "Address comments from previous change (320592)" 2017-01-20 09:57:27 +00:00
TreeHugger Robot
03ccd16ad3 Merge "ConnectivityServiceTest: some fixes in CallbackInfo" 2017-01-20 09:43:19 +00:00
Lorenzo Colitti
3cecaaacbc Merge "Don't loop forever on zero-length ICMPv6 ND options." am: e7128b10a8 am: 113d5f8f40 am: 6bcbb16630 
am: f73df6370a

Change-Id: I4ca872c2e38f9513d0f5cb883a535f96a77afc76
 2017-01-20 09:06:55 +00:00
Lorenzo Colitti
f73df6370a Merge "Don't loop forever on zero-length ICMPv6 ND options." am: e7128b10a8 am: 113d5f8f40 
am: 6bcbb16630

Change-Id: I38ba45068c00c0948f561a788a7015ed250d62b6
 2017-01-20 09:02:50 +00:00
Paul Duffin
1d0244a846 Prepare for removal of legacy-test from default targets 
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Change-Id: If507b641624a2933e722f61e815890fcdf442265
 2017-01-20 09:00:33 +00:00
Lorenzo Colitti
6bcbb16630 Merge "Don't loop forever on zero-length ICMPv6 ND options." am: e7128b10a8 
am: 113d5f8f40

Change-Id: Ic2d6596d14f6176a823fd66b400af8515617c66d
 2017-01-20 08:58:47 +00:00
Lorenzo Colitti
113d5f8f40 Merge "Don't loop forever on zero-length ICMPv6 ND options." 
am: e7128b10a8

Change-Id: If2260dd2b1bdaf2619cee668f8c2ef81e9dcfdce
 2017-01-20 08:54:42 +00:00
Treehugger Robot
e7128b10a8 Merge "Don't loop forever on zero-length ICMPv6 ND options." 2017-01-20 08:47:17 +00:00
TreeHugger Robot
3074c5ade8 Merge "Properly check per UID app ops and dump user restrictions." 2017-01-20 08:40:17 +00:00
Hugo Benichi
b871a7259c Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s ours am: feca77b884 -s ours am: 4c2371db6b 
am: 3d50fd1118  -s ours

Change-Id: I65b787f2752eb7b17ec175336a7f25ba23529781
 2017-01-20 08:31:57 +00:00
Erik Kline
54cb4c5800 Refactor to SimChangeListener class 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameswork-net passes
    - tested wifi-to-mobile tethering, including SIM remove/insert
Bug: 32163131
Change-Id: I6aac9a8f34cfd0079a4433471ec08b9b1ec0d754
 2017-01-20 17:10:00 +09:00
Hugo Benichi
3d50fd1118 Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s ours am: feca77b884 -s ours 
am: 4c2371db6b

Change-Id: I78a3f6ffb4e1906906bf218dd11c8f65c5d3c96b
 2017-01-20 07:59:43 +00:00
Hugo Benichi
3838737df9 ConnectivityServiceTest: some fixes in CallbackInfo 
- CallbackInfo becomes a static class so that it can be instantiated
  and looked at more easily than before.
- CallbackInfo gains hashCode() because it has equals().
- effectively final field are qualified final
- fixes bug when polling the next callback: poll() on a LinkedBlockingQueue
  returns null when timing out, which was not failing the test cleanly.

Test: ConnectivityServiceTest passes
Bug: 32561414

(cherry picked from commit 4e1619f034)

Change-Id: Ica5f1609975e4b256f4e2f3dc2ac84362e762da2
 2017-01-20 16:56:41 +09:00
Hugo Benichi
4c2371db6b Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s ours 
am: feca77b884  -s ours

Change-Id: I847fe5f04ebf8b5634c3ae0974e69d50cef9df76
 2017-01-20 07:55:35 +00:00
Hugo Benichi
feca77b884 Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" 
am: 216a4e7655  -s ours

Change-Id: I05fe9095395df00b96df3cbe3a6e4f31a160e0b5
 2017-01-20 07:51:31 +00:00
Hugo Benichi
216a4e7655 Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" 2017-01-20 07:44:30 +00:00
Erik Kline
efdd3f4ce0 Address comments from previous change (320592) 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - vanilla wifi-to-mobile tethering works
Bug: 32163131

Change-Id: I8788cb0d93606a2893c3dbc4f22e72f450f319b8
 2017-01-20 16:31:29 +09:00
Erik Kline
b1019eb996 Merge "BroadcastReceiver refactoring" am: 73a57bb9da am: bcdd7475e5 am: 2d49de42b8 
am: 75de0b6421

Change-Id: I98b9a0c46a0e3b69a74e2a8c2320090edcb1ad5b
 2017-01-20 07:13:49 +00:00
Jiaquan He
b7f244d56e Merge "2D Recents: round task thumbnails properly." into nyc-mr2-dev am: fb764b7035 
am: c0793c3d4d

Change-Id: I66425ff7677e651f9979e98cc7da0d3000f86771
 2017-01-20 07:12:43 +00:00
Jiaquan He
6a8fcfa7ed 2D Recents: round task thumbnails properly. am: 90f4f5290b 
am: 0dd94210ee  -s ours

Change-Id: If78ce5adf7540d6585a95fe5c2e0c68c384e4876
 2017-01-20 07:11:42 +00:00
Svet Ganov
ee438d4a99 Properly check per UID app ops and dump user restrictions. 
Test: Permission CTS tests pass and shell  dump correct

Change-Id: I7cf4c85781172319891756034b5bade62f76803f
 2017-01-20 06:49:33 +00:00
Lorenzo Colitti
1eda5b25ce Don't loop forever on zero-length ICMPv6 ND options. 
Bug: 33828433

(cherry picked from commit 2f157c421a)

Change-Id: Icc03f0fcbf40d87e0b9c69e1172802ffcc85531b
 2017-01-20 15:48:21 +09:00
Chen Xu
f09acd9d5f Merge "Initial change on carrier signal filtering" am: bfdce89f36 am: 1507930691 am: 923046251b 
am: 038bea5dd1  -s ours

Change-Id: If8647a5437784018aeb8d1704899496cec542dab
 2017-01-20 06:46:23 +00:00
Erik Kline
75de0b6421 Merge "BroadcastReceiver refactoring" am: 73a57bb9da am: bcdd7475e5 
am: 2d49de42b8

Change-Id: I7c1c3ff3a278c536f2483ce5bd58360ab3bbe2cf
 2017-01-20 06:37:37 +00:00
Erik Kline
2d49de42b8 Merge "BroadcastReceiver refactoring" am: 73a57bb9da 
am: bcdd7475e5

Change-Id: I213f5af2393d3fc353114f30205b3378d3f169a5
 2017-01-20 06:33:39 +00:00
Erik Kline
bcdd7475e5 Merge "BroadcastReceiver refactoring" 
am: 73a57bb9da

Change-Id: Iafb0aa75c564aeb4c0181ef0dbacc6de4527480a
 2017-01-20 06:29:36 +00:00
Erik Kline
73a57bb9da Merge "BroadcastReceiver refactoring" 2017-01-20 06:23:36 +00:00
Hugo Benichi
55b5f0f9eb DO NOT MERGE Unit tests for NetworkNotificationManager 
Test: new unit test, no functional changes.
Bug: 32198726

(cherry picked from commit 74264329da)

Change-Id: I123de68de9ae353b95edce89eb570cfbb5f8d9a3
 2017-01-20 15:08:38 +09:00
Adam Lesinski
196473955f Change KernelUidCpuTimeReader Slog.wtf to Slog.e 
There is a known issue in the kernel uidcputime module that triggers
the WTF, which has a cost to the system. Convert to a regular log
instead.

Bug:28950306
Change-Id: I7cbb3138f644075f0d9d65ce8b52bd835eb270fd
(cherry picked from commit 82a4d6f93b)
 2017-01-20 05:33:56 +00:00
TreeHugger Robot
22a6960579 Merge "Disable kernel UID updates until update lands." 2017-01-20 05:11:32 +00:00
Crystal Qin
eb30e64f3f Add new key purpose Wrap Key to KeyProperties.java and 
KeymasterDefs.java.

Test: There will be a CTS test CL submitted together.
Change-Id: Ic60c3efc451cd7cbb04689b3d7bf9d607fae6c1f
 2017-01-19 21:02:10 -08:00
Jiaquan He
c0793c3d4d Merge "2D Recents: round task thumbnails properly." into nyc-mr2-dev 
am: fb764b7035

Change-Id: Idd44a0786190fa84e4c7020a7deb76fb28c333b6
 2017-01-20 04:26:48 +00:00
Jiaquan He
0dd94210ee 2D Recents: round task thumbnails properly. 
am: 90f4f5290b

Change-Id: Ice4ac5f7e32e9d209af2bec53530d8f425609ca2
 2017-01-20 04:26:40 +00:00