Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
302,664 Commits 3 Branches 0 Tags
8fa60ce20e7c7209256eb9dcbb83e5aceff33eb3
Commit Graph

302664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ashutosh Joshi
8fa60ce20e Merge "Add a callback handler for nanoApp aborts." 2017-01-12 23:50:06 +00:00
Ta-wei Yen
a5a2e6d1b1 Merge "Add getNetworkSpecifier() and getCarrierConfig()" 2017-01-12 23:48:06 +00:00
Android Build Merger (Role)
96a3d9c7ca Merge "Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 am: 503d8fbb26 am: 907585c004" 2017-01-12 23:26:39 +00:00
TreeHugger Robot
fac595ae56 Merge "Add activity action for Configure Wi-Fi settings." 2017-01-12 23:25:50 +00:00
Robert Greenwalt
f299153487 Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 am: 503d8fbb26 
am: 907585c004

Change-Id: I05a4da02d0253eec03174277be22fc2daabad774
 2017-01-12 23:25:36 +00:00
Robert Greenwalt
907585c004 Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 
am: 503d8fbb26

Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
 2017-01-12 23:20:45 +00:00
Robert Greenwalt
503d8fbb26 Merge "Add support for FDN contact dial" am: 082b118641 
am: 24dea10375

Change-Id: I5091d35ff79eff952c57109ce120369c95309598
 2017-01-12 23:16:20 +00:00
Todd Kennedy
244a63a2d3 Merge "Allow starting ephemeral apps from 'am'" 2017-01-12 23:14:02 +00:00
Robert Greenwalt
24dea10375 Merge "Add support for FDN contact dial" 
am: 082b118641

Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc
 2017-01-12 23:12:23 +00:00
Robert Greenwalt
082b118641 Merge "Add support for FDN contact dial" 2017-01-12 23:07:00 +00:00
Ta-wei Yen
cc68f0409a Add getNetworkSpecifier() and getCarrierConfig() 
cherry-pick of https://android-review.googlesource.com/#/c/318111/

This allows making network request and getting carrier config on a
specfic SIM.

Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Change-Id: Iebe2d883e193afdde13303d76014dfd7f4fb06dd
Merged-In: Iebe2d883e193afdde13303d76014dfd7f4fb06dd

# Conflicts:
#	telephony/java/android/telephony/TelephonyManager.java
 2017-01-12 23:02:29 +00:00
Todd Kennedy
54b8e5deae Merge "Turn off caching temporarily until we can address some of the issues." 2017-01-12 22:57:56 +00:00
Todd Kennedy
20274d15d8 Turn off caching temporarily until we can address some of the issues. 
Revert "PackageManagerService: Enable package parse cache."

This reverts commit 6453db68ca.

Change-Id: I88b6e08a64827550abda91df2dc06611cedeab62
 2017-01-12 22:56:44 +00:00
TreeHugger Robot
07323a9824 Merge "Add structured sort data to ContentResolver.query." 2017-01-12 22:21:53 +00:00
TreeHugger Robot
a9ef7f472a Merge "Import translations. DO NOT MERGE" 2017-01-12 22:03:08 +00:00
TreeHugger Robot
8f1c5902c0 Merge "Dispatch task change notifications to local callbacks in same thread" 2017-01-12 21:53:46 +00:00
TreeHugger Robot
c493fe34bb Merge "Fix autobundling." 2017-01-12 21:49:36 +00:00
Andrew Sapperstein
dae5bc8270 Merge "Create a global registry for system message IDs" into nyc-mr2-dev am: 1f2769189d 
am: b5571b1a18

Change-Id: I9b4b95e355640479fc114dc145bafb8316346c92
 2017-01-12 21:39:35 +00:00
Chris Wren
6a6c31d90a Create a global registry for system message IDs am: 117d5b4f28 
am: 99a16ab0ec  -s ours

Change-Id: I9d6eb2d464c19e7f0f6c16a85a783c80b9e648e2
 2017-01-12 21:38:28 +00:00
Calin Juravle
4286f7ae46 Merge "Refactor PackageDexOptimizer" 2017-01-12 21:36:00 +00:00
Andrew Sapperstein
b5571b1a18 Merge "Create a global registry for system message IDs" into nyc-mr2-dev 
am: 1f2769189d

Change-Id: I39320f591a7e67ac7af27bc533bdddd0b728ca68
 2017-01-12 21:23:16 +00:00
Chris Wren
99a16ab0ec Create a global registry for system message IDs 
am: 117d5b4f28

Change-Id: Iaa792c9dbffaae807bdf0a8cfb30e66aecb442d6
 2017-01-12 21:23:11 +00:00
Andrew Sapperstein
1f2769189d Merge "Create a global registry for system message IDs" into nyc-mr2-dev 2017-01-12 21:18:28 +00:00
TreeHugger Robot
317d0c9887 Merge "Send Snooze callback for Assistant" 2017-01-12 20:54:52 +00:00
Mark Salyzyn
6f773a0d87 Replace cutils/log.h and android/log.h with log/log.h 
Test: compile
Bug: 34250038
Change-Id: I42185a879beaa9bb244f53a968800392b854ac45
 2017-01-12 20:29:11 +00:00
TreeHugger Robot
4391fae30e Merge "Compile bit on darwin, use -j when invoking make" 2017-01-12 19:38:54 +00:00
Andrew Rossignol
d26d2af79e Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev am: c65a010a39 -s ours 
am: 6ebc52a950  -s ours

Change-Id: I1ae4fb72bc6a5576dfb3894f8b24e529cd52e0a6
 2017-01-12 19:08:24 +00:00
Andrew Rossignol
52cab4a4f7 Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black" am: 57edeef91a -s ours 
am: 4fa95e7bbb  -s ours

Change-Id: If522327abdedb779d2a60be7dafa08701bfde0ac
 2017-01-12 19:07:25 +00:00
Jiaquan He
e8662e389d Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev am: 5c4c5e1682 
am: 97b832a438

Change-Id: I14cfb594bbeecbcd8b86ea0b6931891ed93b82cb
 2017-01-12 19:03:27 +00:00
Jiaquan He
cec869d361 2D Recents: Show shadows behind task views. am: 15fa3246d8 
am: 0cb857822e

Change-Id: Ice75a09a845ed8639c11053a3428f0b01fc40ded
 2017-01-12 19:02:18 +00:00
Andrew Rossignol
6ebc52a950 Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev 
am: c65a010a39  -s ours

Change-Id: I39efaeb589830e7d448e208d37a079c798477224
 2017-01-12 18:59:56 +00:00
Andrew Rossignol
4fa95e7bbb Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black" 
am: 57edeef91a  -s ours

Change-Id: I4e4ed0215ad07f49101119c0f262d0dc5acbab8d
 2017-01-12 18:59:51 +00:00
Shukang Zhou
32d41b1b38 Merge "Close a file descriptor before losing its reference." 2017-01-12 18:59:31 +00:00
Jiaquan He
97b832a438 Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev 
am: 5c4c5e1682

Change-Id: Ide8408c2d18740b4058c49a9c3b4f0912e7c5da9
 2017-01-12 18:56:34 +00:00
Jiaquan He
0cb857822e 2D Recents: Show shadows behind task views. 
am: 15fa3246d8

Change-Id: Ia2401df9750bb42a53ae214ed8998e1225499337
 2017-01-12 18:56:27 +00:00
TreeHugger Robot
c65a010a39 Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev 2017-01-12 18:52:42 +00:00
Jiaquan He
5c4c5e1682 Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev 2017-01-12 18:50:11 +00:00
Selim Cinek
d7b92cf873 Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev am: c1c7d1f938 
am: 8b36bbf0ea  -s ours

Change-Id: I8b7cba700a76670ce67ec8e3fe377fd16f7df78d
 2017-01-12 18:48:04 +00:00
Selim Cinek
70e665be06 Fixed a bug where notifications could stay expanded am: b2236108ae 
am: 97f14c47db  -s ours

Change-Id: I8871b9f79245de04271894a6e2e508b1c55280de
 2017-01-12 18:46:57 +00:00
Selim Cinek
8b36bbf0ea Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev 
am: c1c7d1f938

Change-Id: I58bf2fdd1b1b89d8b9b7b86110836ee1f6c56ffa
 2017-01-12 18:42:41 +00:00
Selim Cinek
97f14c47db Fixed a bug where notifications could stay expanded 
am: b2236108ae

Change-Id: I9c776321f0865f6971692008256cd80adbab5469
 2017-01-12 18:42:32 +00:00
Ben Wagner
610fbb3afd Merge "Use FatVector instead of SkAutoMalloc in VulkanManager." 2017-01-12 18:41:51 +00:00
Calin Juravle
2d4b6ad7f3 Refactor PackageDexOptimizer 
Split performDexoptLI in multiple smaller helpers. This will help in
adding the logic to process secondary dex files.

The goal is to move towards simple logic which can be reused between
compiling the package's code and its secondary dex files.

Test: device boots, packages get compiled in the background job,
      adb shell cmd package compile -m speed|speed-profile packageName

Bug: 32871170
Change-Id: I2d55edf42baa768f990939a82b3d52edf5f68a2c
 2017-01-12 10:38:54 -08:00
Selim Cinek
c1c7d1f938 Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev 2017-01-12 18:37:07 +00:00
Julia Reynolds
0e4203d72c Fix autobundling. 
Test: manual
Change-Id: I9071b3e52172d152a4ccd685f4fd41944d2e40c9
 2017-01-12 18:34:36 +00:00
Yorke Lee
1329407c62 Dispatch task change notifications to local callbacks in same thread 
Currently, task change notifications are dispatched to the
listeners on a separate thread even if the callback lives in
the system process. As a result, they happen too late to
respond to certain key events in a task's state change.

This CL fixes this issue by tracking local and remote listeners
separately, and notifying local listeners directly instead of
on the handler thread.

Test: Manual - verify that local callbacks delivered to the
TaskWindowPlacer are called in the same thread as the main
ActivityManager thread.
Test: run TaskStackChangedListenerTest
Bug: 33664258

Change-Id: I92f20d539558054368acfa836bd2476e9ae81b33
 2017-01-12 10:34:07 -08:00
Winson Chung
7c31e6aa23 Merge "Replacing removed string." 2017-01-12 18:17:37 +00:00
Android Build Merger (Role)
b9dd3d6a4d Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 2f9af2aa69 -s ours am: 04f8ba7bb7 -s ours" 2017-01-12 17:41:12 +00:00
Bill Yi
6590929cfa Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 2f9af2aa69 -s ours 
am: 04f8ba7bb7  -s ours

Change-Id: I4f4317d788bff53bf621b06a6e01498f8497253a
 2017-01-12 17:40:23 +00:00
Android Build Merger (Role)
8f8f3b3b1b Merge "Import translations. DO NOT MERGE am: 50a1d26ac0 -s ours am: 5aef5be20b -s ours" 2017-01-12 17:40:08 +00:00