Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,484 Commits 3 Branches 0 Tags
fb19d8d7c142aae0aaa9782db145fee072071fbf
Commit Graph

277484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
5f71bfc72f Merge "docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 5dc8052df6" into nyc-mr1-dev-plus-aosp 2016-09-26 17:33:19 +00:00
Josh Horwich
93da468b5f Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54 
am: 3ecd86b7c6

Change-Id: Iecf109d7b37283f221bfebe263db563c9e0195dd
 2016-09-26 17:32:53 +00:00
Mark Lu
fd4f71e3c3 docs: improve docs for sqlite package summary am: 59640a9f1c 
am: e9480d08d3

Change-Id: I31119ebf54616d80d1bb2e508014f8563c5a0b88
 2016-09-26 17:32:37 +00:00
Mark Lu
901e97e133 docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 
am: 5dc8052df6

Change-Id: I675b709d12581d9bb3c67b48eb3be9b7dcc75a88
 2016-09-26 17:32:36 +00:00
Android Build Merger (Role)
00fb6698f8 Merge "Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c am: 3818ca2a95" into nyc-mr1-dev-plus-aosp 2016-09-26 17:32:35 +00:00
Mark Lu
4fe3d2380e Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 
am: a96dec6a80

Change-Id: Iabfe9e5233086834064f4dc2de19b318127ee3d3
 2016-09-26 17:31:52 +00:00
Josh Horwich
4ab56579a5 Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c 
am: 3818ca2a95

Change-Id: I5783931020c0bedeba5426b2a0ce4e8733f28fd7
 2016-09-26 17:31:38 +00:00
Mark Lu
cb0c4c5d8a Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3 
am: 3b4add4667

Change-Id: Ia3afb8b76491531ba2ae4ec8a41850493299f930
 2016-09-26 17:31:22 +00:00
Mark Lu
33ec89cd65 docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 
am: 376f3e6b3a

Change-Id: Iaeb30e87c43da49c294ca551f778e66d6b309d1d
 2016-09-26 17:31:05 +00:00
smain@google.com
420ebe877d switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC 
am: 01569c41e7

Change-Id: Ia1344bf39709ece4ec33aaeb67c9520bdc5d7176
 2016-09-26 17:30:37 +00:00
Mark Lu
0f31433733 Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3 
am: d40a9f4c4e

Change-Id: Iadfc78dac99cdedd3217d9d60da9be06dcfafef1
 2016-09-26 17:30:14 +00:00
Tyler Gunn
e62ab8a3b6 Merge "Change data usage alert/disabled messages." into nyc-mr1-dev 
am: 29678c0357

Change-Id: I8eee735e7cbd13a5c05e456c01f92aac43046e8c
 2016-09-26 17:30:14 +00:00
smain@google.com
b893a93dc1 switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC 
am: 01569c41e7

Change-Id: I1c69baf4233807d3ea33daf4bfe3f7ed8201b42a
 2016-09-26 17:30:11 +00:00
Tyler Gunn
d7a14989a9 Change data usage alert/disabled messages. 
am: 65ed8f9512

Change-Id: I3344dfbb64efad0a920e846a8e0de28fc1059074
 2016-09-26 17:30:04 +00:00
Hidenari Koshimae
469e65e37f Increase priority for broadcast intent triggered by HW key 
Add the FLAG_RECEIVER_FOREGROUND flag to the broadcast intent
triggered by hardware key.
This prevents the framework from delaying the delivery of the
intent to its recipients, and improves the response for hardware
key event under heavy load on the system.

Bug: 28735973
Change-Id: Ib7f219845be34794f4c7545927e53cc6c2b504a3
 2016-09-26 18:29:06 +01:00
Hemal Patel
f6356ef3f6 Fixed a typo in the code sample am: 247d1c9ea8 
am: 6a400a5190

Change-Id: Idbf5c554ac863e7c2024816ad726d6e6c8cb9d2f
 2016-09-26 17:29:02 +00:00
Android Build Merger (Role)
3e952acba8 Merge "Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67 am: ad5ef71eff" into nyc-mr1-dev-plus-aosp 2016-09-26 17:28:28 +00:00
Michael Wright
7a7a82c20d Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67 
am: ad5ef71eff

Change-Id: Ifcff1f271119ae23ef30b547ca77167dd76d1292
 2016-09-26 17:27:40 +00:00
Hemal Patel
7829ef7cf0 Fixed a typo in the code sample am: 247d1c9ea8 
am: 9fa6e02d2d

Change-Id: Ic7e084556e86ec99f01f7f5d6a423cb9c134ba73
 2016-09-26 17:27:19 +00:00
Tyler Gunn
29678c0357 Merge "Change data usage alert/disabled messages." into nyc-mr1-dev 2016-09-26 17:26:21 +00:00
Mark Lu
0be2abbce1 Merge "docs: improve docs for sqlite package summary" into nyc-dev 
am: 0a544fa4a7

Change-Id: Idd212c577fff4b6aa05dd14dfe77bddbb217b802
 2016-09-26 17:24:09 +00:00
Mark Lu
195099dc32 docs: improve docs for sqlite package summary 
am: 59640a9f1c

Change-Id: I9ec1851274071cb1882839df68e27d1c9b98f8f7
 2016-09-26 17:24:06 +00:00
Mark Lu
41ea66f1b8 Merge "docs: improve docs for sqlite package summary" into nyc-dev 
am: 0a544fa4a7

Change-Id: I9595c5ba41e2d31b94d10b45f0b102f9319066b0
 2016-09-26 17:23:41 +00:00
Mark Lu
e9480d08d3 docs: improve docs for sqlite package summary 
am: 59640a9f1c

Change-Id: I2198d8f3a88980594011072f0dbd3b6a02635939
 2016-09-26 17:23:38 +00:00
smain@google.com
01569c41e7 switch utm_medium to utm_source 
fix a couple hashes
update the test recorder URL from TAC to DAC

Change-Id: Ia57823559e3629320e9562a585972ccb148fe07e
 2016-09-26 10:23:13 -07:00
Mark Lu
8d7dfafadf Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev 
am: b764c94a26

Change-Id: I2a3b858efa1881cd455412a19a7cfb5f7786bd34
 2016-09-26 17:22:48 +00:00
Mark Lu
5dc8052df6 docs: Update docs for SQLiteDatabase replace methods 
am: 1e20208d90

Change-Id: I8222fae7025d5a546b0b3d6b0ebbb7abae66ba8b
 2016-09-26 17:22:45 +00:00
Mark Lu
a96dec6a80 Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev 
am: b764c94a26

Change-Id: Ifa21bc0dc7722e28f294877aae99e5b4cc1e1997
 2016-09-26 17:22:18 +00:00
Mark Lu
376f3e6b3a docs: Update docs for SQLiteDatabase replace methods 
am: 1e20208d90

Change-Id: Ibf13d426352f8845b9fd8086ebfbf54af3f3017c
 2016-09-26 17:22:15 +00:00
TreeHugger Robot
862fbe0828 Merge "Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9" into nyc-mr1-dev-plus-aosp 2016-09-26 17:21:17 +00:00
Mark Lu
3b4add4667 Merge "Fixed a typo in the code sample" into nyc-dev 
am: 537481e2c3

Change-Id: Iab4f3930c44319d1adba37b3798d133c57763102
 2016-09-26 17:21:10 +00:00
Michael Wright
44d11d1328 Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev 
am: 99ff7405a3

Change-Id: I54c98d84d90a7317d949cefc898f7bdf92649c86
 2016-09-26 17:21:04 +00:00
Mark Lu
d40a9f4c4e Merge "Fixed a typo in the code sample" into nyc-dev 
am: 537481e2c3

Change-Id: I266099fbc1102a5accd1080638745924718ec6fc
 2016-09-26 17:21:04 +00:00
Hemal Patel
9fa6e02d2d Fixed a typo in the code sample 
am: 247d1c9ea8

Change-Id: Ic07c17c95e29ce916e2cde22cbb0ce797f8c65fe
 2016-09-26 17:21:04 +00:00
Michael Wright
994c5722d6 Disable battery saver when booting with sufficient battery 
am: 2763c2ba6c

Change-Id: I7b94bc0ce1c370d456cc9275aa1067929d4d95d0
 2016-09-26 17:21:00 +00:00
Hemal Patel
6a400a5190 Fixed a typo in the code sample 
am: 247d1c9ea8

Change-Id: I2f004e4900ed39d6564e0c3947f27fa79eac2266
 2016-09-26 17:21:00 +00:00
Michael Wright
f573fcbd07 Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9 
Change-Id: Ica939f489382b8e0fe9256ebda89f326aa197228
 2016-09-26 18:15:18 +01:00
Etan Cohen
27c18cbb5b [NAN] Replace int peerId with more opaqure Object peerHandle per API review 
(cherry-pick of commit f02ae5e23c)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I0225027b8e1a2d7cb5d27afc91b97ef9643f5dff
 2016-09-26 10:14:35 -07:00
TreeHugger Robot
99ff7405a3 Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev 2016-09-26 17:14:19 +00:00
Mark Lu
0a544fa4a7 Merge "docs: improve docs for sqlite package summary" into nyc-dev 2016-09-26 17:12:51 +00:00
Mark Lu
b764c94a26 Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev 2016-09-26 17:12:32 +00:00
Mark Lu
537481e2c3 Merge "Fixed a typo in the code sample" into nyc-dev 2016-09-26 17:11:57 +00:00
Etan Cohen
b041ae49d6 Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6 am: f95a3703c1 
am: c83ae8d290

Change-Id: I1b8db56db307ce8d81a8df5833030d823724f42e
 2016-09-26 16:58:27 +00:00
Etan Cohen
c83ae8d290 Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6 
am: f95a3703c1

Change-Id: Ic271ac809add1ac66b468ee337f2838e2a008cdc
 2016-09-26 16:53:04 +00:00
Etan Cohen
f95a3703c1 Merge "[NAN] Change Broadcast for NAN status change to notification only" 
am: e1513a8cc6

Change-Id: I71c367bdeb395e330d57252bc77c9817e8870fb5
 2016-09-26 16:48:39 +00:00
Etan Cohen
e1513a8cc6 Merge "[NAN] Change Broadcast for NAN status change to notification only" 2016-09-26 16:40:53 +00:00
Bill Yi
8f05e63417 Import translations. DO NOT MERGE 
Change-Id: I34fa8bbc66ae81ab88950aa01e31523bb1dce657
Auto-generated-cl: translation import
 2016-09-26 09:09:57 -07:00
Josh Horwich
3ecd86b7c6 Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce 
am: 5ca7164e54

Change-Id: I9aac3d3819aed289b9f6b24a2609dc69c4c178a1
 2016-09-26 15:44:42 +00:00
Josh Horwich
3818ca2a95 Docs: Fix missing space am: 999fe148e4 am: 0413b48aba 
am: 0f895d3d9c

Change-Id: I90245f5815502f4e53609f8458537336101caf55
 2016-09-26 15:43:42 +00:00
Michael Wright
ad5ef71eff Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev 
am: 6f1b29ef67

Change-Id: Id8dd0eb4d799fa059e811c48027048ad27650559
 2016-09-26 15:42:53 +00:00