drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,792 Commits 1 Branch 0 Tags
Commit Graph

121792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
7e29625463 Merge "Fix broken XML parsing idiom." 2014-01-07 10:02:57 +00:00
Svetoslav
a7aa078fb2 Merge "PrintSpooler crash if printer is reported to have only one color mode." 2014-01-07 02:03:01 +00:00
Svetoslav
b0d97b87ba PrintSpooler crash if printer is reported to have only one color mode. 
bug:11993304

Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c
 2014-01-06 18:00:54 -08:00
quddusc
e79c9561bf am 9795592c: am 976b0d13: am fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit '9795592c3c02c2f7d1edc38185076779b17e2664':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-07 00:44:57 +00:00
Baligh Uddin
ecc6f3fb89 am ff1f1c45: (-s ours) am 24c2980c: (-s ours) am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ff1f1c452ceebd0502a5ad4110446cb0b768a6e9':
  Import translations. DO NOT MERGE
 2014-01-07 00:44:52 +00:00
Baligh Uddin
927d1602b1 am a9bec69a: (-s ours) am fce88971: (-s ours) am f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE 
* commit 'a9bec69a95e6c6a8629d76eab3d090e688f046e9':
  Import translations. DO NOT MERGE
 2014-01-07 00:44:46 +00:00
quddusc
9795592c3c am 976b0d13: am fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit '976b0d135a87217212e0294b8e4ab07a6034f179':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-07 00:41:21 +00:00
Baligh Uddin
ff1f1c452c am 24c2980c: (-s ours) am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '24c2980cb2a9a93d1d6fe2a849f915b3819056c2':
  Import translations. DO NOT MERGE
 2014-01-07 00:41:17 +00:00
Baligh Uddin
a9bec69a95 am fce88971: (-s ours) am f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE 
* commit 'fce889710225bfefd99af59afb83085b23a79704':
  Import translations. DO NOT MERGE
 2014-01-07 00:41:12 +00:00
quddusc
976b0d135a am fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit 'fd08cd4852e285434e9067e09cad41bef28068ca':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-07 00:37:50 +00:00
Baligh Uddin
24c2980cb2 am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'be24e41b41e9ccec3bb685baf9dc951b386116ee':
  Import translations. DO NOT MERGE
 2014-01-07 00:37:46 +00:00
Baligh Uddin
fce8897102 am f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE 
* commit 'f256f49f9fddbd035375ea8c6444cf7fa36418ca':
  Import translations. DO NOT MERGE
 2014-01-07 00:37:41 +00:00
quddusc
fd08cd4852 am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit '0d4068ad1cbc8b8c550118c2214eb70116b83f81':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-06 16:30:35 -08:00
Baligh Uddin
be24e41b41 am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2':
  Import translations. DO NOT MERGE
 2014-01-06 16:30:30 -08:00
Baligh Uddin
f256f49f9f am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE 
* commit '258bd63f38d90ac96aac5eb4e3a5c696e8b089f8':
  Import translations. DO NOT MERGE
 2014-01-06 16:30:25 -08:00
Conley Owens
d8a6c59d3d am 5b44325f: am 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '5b44325fff247558ca36d83930b877dc44e5e219':
  CompoundButton: Let text can be changed by config
 2014-01-06 23:51:24 +00:00
Conley Owens
5b44325fff am 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '849ab14d7237d3474f6dde3731ab65624ac297ac':
  CompoundButton: Let text can be changed by config
 2014-01-06 23:48:58 +00:00
Conley Owens
849ab14d72 am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '7f16047b9efeba7cf82690b0492eaed44ca017df':
  CompoundButton: Let text can be changed by config
 2014-01-06 23:46:00 +00:00
Conley Owens
7f16047b9e am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '73a6702eeaabdeb7b405ec504413d41716ef3508':
  CompoundButton: Let text can be changed by config
 2014-01-06 15:41:50 -08:00
Conley Owens
73a6702eea am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '4440a8244ea4fdd7c63083bcd7d4b179e851c17a':
  CompoundButton: Let text can be changed by config
 2014-01-06 15:38:05 -08:00
Conley Owens
4440a8244e Merge "CompoundButton: Let text can be changed by config" 2014-01-06 23:36:03 +00:00
Mark Salyzyn
344389f731 Merge "jni: Incorporate liblog reading API" 2014-01-06 23:04:09 +00:00
Jean-Michel Trivi
a144b121b2 Merge "Fix RemoteController synchronization mode" 2014-01-06 22:46:43 +00:00
Dave Platt
76e5ca81b3 Fix descriptor leak after accepting connections 
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.

Bug: 11805817

(cherry picked from commit 3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d)

Change-Id: I723d7c5544ee4b6858894c215716cbc32a958df1
 2014-01-06 14:31:28 -08:00
Dave Platt
02f042ddd9 Fix socket descriptor leak from Zygote to child app 
Due to an API change in LocalSocket, Zygote must now
manually close the FileDescriptor it created when it
registered a LocalServerSocket.  The LocalSocket.close()
routine will no longer do so.

Bug: 12114500

(cherry picked from commit 70ef29b04ee4ef7d7acfec79041dbe800961195e)

Change-Id: Ief23a3c99e007dc4aa6f94dfb47a1b2b6c854dad
 2014-01-06 13:59:20 -08:00
quddusc
0d4068ad1c am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit 'ff65ca29a00aa282160dd8a77cdd6ed6855abba7':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-06 21:58:03 +00:00
quddusc
ff65ca29a0 Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 2014-01-06 21:55:28 +00:00
Mark Salyzyn
e11cbd441d jni: Incorporate liblog reading API 
Change-Id: I8b78e4db67b6daabb975ce740fb40478df4ffcef
 2014-01-06 13:51:48 -08:00
Baligh Uddin
2c4d6d91e2 am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fd8be467a38eded82d17740824cf87daa38e25e0':
  Import translations. DO NOT MERGE
 2014-01-06 13:47:50 -08:00
Baligh Uddin
258bd63f38 am 6e15a49e: (-s ours) Import translations. DO NOT MERGE 
* commit '6e15a49eee1398aaf73f6b994b4148b198b67430':
  Import translations. DO NOT MERGE
 2014-01-06 13:47:46 -08:00
Baligh Uddin
c2ee7bb146 Merge "Import translations. DO NOT MERGE" 2014-01-06 21:45:23 +00:00
Baligh Uddin
fd8be467a3 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-01-06 21:45:16 +00:00
Baligh Uddin
5bdb5cd335 Merge "Import translations. DO NOT MERGE" 2014-01-06 21:45:09 +00:00
Baligh Uddin
d5b2a3aae8 Import translations. DO NOT MERGE 
Change-Id: I88c828f80f2fc1ff71f868c0e6630d68ddac9ba4
Auto-generated-cl: translation import
 2014-01-06 13:17:32 -08:00
Baligh Uddin
b852d28cc1 Import translations. DO NOT MERGE 
Change-Id: Ic05c1c30830a0c9d7cb62fd53f6b144650e05609
Auto-generated-cl: translation import
 2014-01-06 13:15:51 -08:00
Baligh Uddin
9d31f7e6ef Import translations. DO NOT MERGE 
Change-Id: I4a38f3f7e116afdebf615f41e4f8305825c56507
Auto-generated-cl: translation import
 2014-01-06 12:39:16 -08:00
Alan Viverette
0ffd9ca579 Merge "Use layers for reveal drawable" 2014-01-06 20:37:31 +00:00
Baligh Uddin
6e15a49eee Import translations. DO NOT MERGE 
Change-Id: Iad53d8fd9f6b72114c8ab0444d60e8fed54f1df9
Auto-generated-cl: translation import
 2014-01-06 12:16:37 -08:00
John Spurlock
f121921d9a Merge "Add rotation-lock to Quick Settings on phones." 2014-01-06 19:21:58 +00:00
Chong Zhang
f12aa45bcb Merge "MediaRecorder: add getSurface() api and SURFACE video source" 2014-01-06 19:05:09 +00:00
Chong Zhang
83cc994ba4 MediaRecorder: add getSurface() api and SURFACE video source 
Bug: 12305192
Change-Id: If833c5ac8a738ffa284307e0435b5cbd1b7379b1
 2014-01-06 10:42:51 -08:00
Raph Levien
dcd8258e24 am 971003c9: am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit '971003c9ffc854f4b080af902457e7a6447f692a':
  Re-initialize error after attach
 2014-01-06 17:16:02 +00:00
Todd Poynor
0e3f0caee6 am a807dbae: am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
* commit 'a807dbaeed2a125cea6868f6d51402f8416fddec':
  ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
 2014-01-06 17:15:53 +00:00
Raph Levien
971003c9ff am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'ece5bc9d692ec1579f45d9e28fdf52c1d966a21b':
  Re-initialize error after attach
 2014-01-06 17:12:18 +00:00
Todd Poynor
a807dbaeed am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
* commit '91ecb36df50be3446809e9da2a8f571d157f7549':
  ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
 2014-01-06 17:12:11 +00:00
Raph Levien
ece5bc9d69 am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit '7b6b85d260fb4fe739e0af0cc0328e0678872899':
  Re-initialize error after attach
 2014-01-06 17:08:56 +00:00
Raph Levien
7b6b85d260 am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'd7d0749805b6ae8bb345731ac9dd960f6b5aa5dd':
  Re-initialize error after attach
 2014-01-06 09:06:06 -08:00
Raph Levien
d7d0749805 am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'a980c7aa3ec901b7c4201776a9a4e3a5fc3e50df':
  Re-initialize error after attach
 2014-01-06 09:04:03 -08:00
Raph Levien
a980c7aa3e Merge "Re-initialize error after attach" 2014-01-06 17:00:49 +00:00
Craig Mautner
e0a3884cb6 Extend stack management to other displays. 
- Abandon ActivityContainer.startActivity() in favor of
IActivityManager.startActivityAsUserInContainer().
- Modify Am to test starting an activity on a container.
- Create a DisplayContext as the base context if the activity token
is on a different display.
- Test for home display in more cases when manipulating home stack.
- Rename mDisplayInfos => mActivityDisplays.
- Create new method for moving task to front of stack regardless of
which display it is on.

Change-Id: I4fcb83ae844c5839ee3e2722229623d1a80ed921
 2014-01-06 08:51:21 -08:00