142032 Commits

Author SHA1 Message Date
Elliott Hughes
b58d385e17 resolved conflicts for merge of f6be5a7a to master
Change-Id: I6dcfb33981df90877fb9f3752b853cf377633edf
2014-07-09 17:40:24 -07:00
Robert Ly
051a3204d4 am 10c286d6: am cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev
* commit '10c286d657c93c8b80b8d336661569256749f39e':
  Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"
2014-07-10 00:19:56 +00:00
Elliott Hughes
f6be5a7ac8 am f072fda1: am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."
* commit 'f072fda13fd47d7dc7246cb821a26990d8fb271f':
  Switch frameworks/base/core/jni to the new icu.
2014-07-10 00:16:29 +00:00
Robert Ly
10c286d657 am cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev
* commit 'cc2af1c010ae896ef6aea7c428876ea5d9a7dc73':
  Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"
2014-07-10 00:11:33 +00:00
Elliott Hughes
f072fda13f am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."
* commit 'effcc83e42638a5fa7eceaebe22081a1b9eaebaf':
  Switch frameworks/base/core/jni to the new icu.
2014-07-10 00:08:29 +00:00
Quddus Chong
8e086faf89 am 9afee0df: docs: Added missing instructions for copying the Google Play Services library project.
* commit '9afee0df49ce019bf8c8d1c7dc15857949637ccf':
  docs: Added missing instructions for copying the Google Play Services library project.
2014-07-09 23:02:01 +00:00
Quddus Chong
9afee0df49 docs: Added missing instructions for copying the Google Play Services library project.
Change-Id: I04bbfce7e3901a1aa14a3c2a273674014c60ae17
2014-07-09 15:49:17 -07:00
Elliott Hughes
effcc83e42 Merge "Switch frameworks/base/core/jni to the new icu." 2014-07-09 22:27:32 +00:00
Elliott Hughes
92b1896dfd Switch frameworks/base/core/jni to the new icu.
Change-Id: Id12ce02da377ce78f318e10633c47f500237d9d9
2014-07-09 16:56:11 -07:00
Robert Ly
0d15ec7828 am d7880b6a: docs: fix packaging instructions again to reflect correct metadata name
* commit 'd7880b6a50aa0dbea66923a4672d360229ab3aca':
  docs: fix packaging instructions again to reflect correct metadata name
2014-07-09 19:19:54 +00:00
Robert Ly
d7880b6a50 docs: fix packaging instructions again to reflect correct metadata name
Change-Id: I61659811065ad5f0fa8f722f80793e707730604c
2014-07-09 12:13:27 -07:00
Ricardo Cervera
811aeae953 am e34167ce: Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev
* commit 'e34167cef73e23c4be4bf5d7a1517e609122d652':
  docs: Fixed minor issues with Wear docs. Bug: 16062631
2014-07-09 18:38:20 +00:00
Ricardo Cervera
941fe57735 am 3a958b9f: docs: Fixed nav bar color in material docs. Bug: 16160906
* commit '3a958b9f851a8985bed5fac1499c5553ff566b9e':
  docs: Fixed nav bar color in material docs. Bug: 16160906
2014-07-09 18:38:16 +00:00
Robert Ly
fdefaadab5 am a0d38aa4: Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev
* commit 'a0d38aa4e58eee27b561420047d0aafcdaed93f1':
  docs: remove gms core preview for wear and redirect
2014-07-09 18:33:49 +00:00
Ricardo Cervera
3a958b9f85 docs: Fixed nav bar color in material docs. Bug: 16160906
Change-Id: I56eb7f4d0e9a0a24b1fb38f08dd8ccba6c91dd17
2014-07-09 11:32:40 -07:00
Robin Lee
06505d234d am 1f0180bf: am 74803e55: Merge "Make misc config directory during user creation"
* commit '1f0180bfa877373b239a5675f715288db829fa75':
  Make misc config directory during user creation
2014-07-09 17:43:56 +00:00
Robin Lee
1f0180bfa8 am 74803e55: Merge "Make misc config directory during user creation"
* commit '74803e559caffe235b86dc52cf76ef98343c0d74':
  Make misc config directory during user creation
2014-07-09 17:39:13 +00:00
Robert Ly
fff6fdbf57 am 33f5a318: Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev
* commit '33f5a318b981a69542bfd158e3fec5814135665a':
  docs: surface ui toolkit at a higher level
2014-07-09 16:50:42 +00:00
Robert Ly
2d3fca2490 am db520137: Merge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev
* commit 'db520137dbd67d4b8ec65011accadda7e25ec844':
  docs: fix wear packaging for paid apps instructions
2014-07-09 16:28:29 +00:00
Robert Ly
41d6cc1b8e am e0b5829e: Merge "docs: fix 2d picker image description" into klp-modular-dev
* commit 'e0b5829eb1eac1be768343371da71e7d53d9eff5':
  docs: fix 2d picker image description
2014-07-09 15:51:13 +00:00
Robert Ly
9a529d1b31 am 6f52e7be: Merge "docs: fix link to messages doc" into klp-modular-dev
* commit '6f52e7be188781a906cc53dcd96268ffbfdfc283':
  docs: fix link to messages doc
2014-07-09 15:06:37 +00:00
Ricardo Cervera
e34167cef7 Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev 2014-07-09 14:50:26 +00:00
Ricardo Cervera
4adf1e069b docs: Fixed minor issues with Wear docs. Bug: 16062631
Change-Id: Ieaa02cfedd1b9b6f59c6937a056c8d4f4eb4188e
2014-07-09 11:30:23 -07:00
Robert Ly
a0d38aa4e5 Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev 2014-07-09 14:50:26 +00:00
Robert Ly
fa813cebaa docs: remove gms core preview for wear and redirect
Change-Id: I8dd618a8fc99034cd73927d4aa312fe871081f83
2014-07-09 09:46:45 -07:00
Robert Ly
1d5393298b docs: surface ui toolkit at a higher level
Change-Id: If17cebda4606404f13d10ecb1540eda75b5e11ec
2014-07-09 09:42:29 -07:00
Robert Ly
6d36bbe11b docs: fix wear packaging for paid apps instructions
Change-Id: Ibf2cbe2e4bcb7e998665b10c5632c786dcc90e76
2014-07-09 09:23:23 -07:00
Robert Ly
106ecfdca7 docs: fix 2d picker image description
Change-Id: Id554a7090986e71a502dc070468d26f8d546cc2c
2014-07-09 08:46:37 -07:00
Robert Ly
546d0ba888 docs: fix link to messages doc
Change-Id: I382a2ec26634f8d7427344657de0a66b187562cb
2014-07-09 07:59:07 -07:00
Tim Murray
91758a3946 Merge "Update copyFrom(BaseObj[]) for large objects." 2014-07-09 14:43:38 +00:00
Tim Murray
3de3dc79e5 Update copyFrom(BaseObj[]) for large objects.
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
2014-07-09 15:30:42 -07:00
Alan Viverette
d5c72cbc23 Merge "Remove icon from base alert dialog, use light theme" 2014-07-09 21:45:32 +00:00
Alan Viverette
c65ff211af Remove icon from base alert dialog, use light theme
BUG: 16160305
Change-Id: I3cc5b5f0f02ddffb19b06b4796dedb98a6083454
2014-07-09 23:23:43 +00:00
Quddus Chong
4696936e9b am 8e086faf: am 9afee0df: docs: Added missing instructions for copying the Google Play Services library project.
* commit '8e086faf89a0c59163731cbe2c7778b7365722ab':
  docs: Added missing instructions for copying the Google Play Services library project.
2014-07-09 23:14:57 +00:00
Jeff Sharkey
30303faea6 Merge "Extend pm to support sessions and split APKs." 2014-07-09 21:45:32 +00:00
Jeff Sharkey
ec55ef0934 Extend pm to support sessions and split APKs.
Separate commands to create an install session, stream files into the
staging area, and then commit the install.  Streaming can accept data
from stdin across adb, avoiding extra copy from push.

Extend FileBridge to support blocking close().  Always destroy
session regardless of result.

Bug: 14975160
Change-Id: Ic3f462e7d1901079b785e210228950cdfa676466
2014-07-09 16:55:56 -07:00
ztenghui
83f7ee8d12 Remove the unnessary log
We still need to investigate the underlying problem and fix it.

bug:16015708

Change-Id: If38b550d5af990d5aaa6633ee129a61e927d66c1
2014-07-09 23:53:54 +00:00
Jeff Sharkey
2cfc848226 Add versionCode to split manifest; compile.
To verify consistency at install time, all APK manifests must declare
the same package name and version code.  Also start compiling the
manifest, since versionCode is an attribute.

Bug: 14975160
Change-Id: I2a1a769bd3dfde05b19563af5ca9b6c15a9c95ff
2014-07-09 16:12:49 -07:00
Selim Gurun
cb665af8f1 Merge "Add an API to disable data reduction proxy." 2014-07-09 22:27:31 +00:00
Selim Gurun
7871554e1a Add an API to disable data reduction proxy.
Bug: 16011253

Under rare circumstances, the application may need to disable the
data reduction proxy. This is to provide a way to do that.

Change-Id: I031f689f9d72460c7241aec78459185e0b31f059
2014-07-09 16:50:00 -07:00
Andres Morales
54f5884b35 Merge "Service for reading and writing blocks to PST partition" 2014-07-09 22:27:31 +00:00
Andres Morales
68d4acd205 Service for reading and writing blocks to PST partition
Permits apps with permission
android.permission.ACCESS_PERSISTENT_PARTITION to obtain
a read and write data blocks to the PST partition.

Only one block ever exists at one time in PST. When
a client writes another block, the previous one is
overwritten.

This permits storing a block of data that will live
across factory resets.

Change-Id: I8f23df3531f3c0512118eb4b7530eff8a8e81c83
2014-07-09 16:27:17 -07:00
Colin Cross
ed51d70df8 Merge "ActivityManager: pass the main uid of the app to lmkd" 2014-07-09 21:39:59 +00:00
Ruben Brunk
7f3c084c95 camera2: Add NoiseProfile HAL tag.
Change-Id: Iac1b5b7708222b00a9eb1fb1adc85f0d0a7912cb
2014-07-09 22:47:45 +00:00
Jeff Sharkey
307f1d9e71 Merge "Add versionCode to split manifest; compile." 2014-07-09 21:34:29 +00:00
Winson Chung
78155d5d14 Merge "Fixing random crash when transitioning to Recents, ensuring we don't update the TextView unnecessarily." 2014-07-09 21:30:41 +00:00
Winson Chung
bdbb87dd74 Fixing random crash when transitioning to Recents, ensuring we don't update the TextView unnecessarily.
Change-Id: I93ab512642f6e95ee96e041614f063f46420bb39
2014-07-09 14:39:52 -07:00
Prerepa Viswanadham
b108a6fef1 Unhide the Bluetooth(BLE) offload capability apis
Change-Id: Ice3f4f5ff4b8318bf6afe7021b253fe9ea4661d3
2014-07-09 21:23:51 +00:00
Jim Miller
c522d1646a Decouple critical policy power update from SCREEN_ON broadcast
This attempts to fix a bug where ordered broadcasts like
ACTION_SCREEN_ON are substantially delayed by misbehaving
receivers.  Instead, we immediately send the state to mPolicy
so that it can wake/sleep the device without delay.

Fixes bug 14313639

Change-Id: I21a191f90e0a19f1ee75c160ecc4e63e8def709e
2014-07-09 21:12:09 +00:00
Prerepa Viswanadham
8f2e74cac2 OnFound and Onlost callback integration
Change-Id: I23473b18484f041c4dd808c85bb92545a77e20c2
2014-07-09 21:07:13 +00:00